Skip to content

[ci] fix how tactical retries work when build.yaml is changed #15705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjllanwarne wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[ci] fix how tactical retries work when build.yaml is changed #15705

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions ci/ci/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,11 +532,19 @@ async def _start_build(self, db: Database, batch_client: BatchClient):
log.info(f'PR #{self.number} selected steps ({len(requested_steps_set)})')
requested_step_names = list(requested_steps_set)

config = BuildConfiguration(
self,
build_yaml,
scope='test',
requested_step_names=requested_step_names,
pr_labels=frozenset(self.labels),
)

tactical = self.tactical
tactical_skipped: Dict[str, int] = {}
if tactical and requested_step_names is not None:
if tactical:
succeeded_steps: Dict[str, int] = {}
requested_steps_set = set(requested_step_names)
steps_to_check = set(step.name for step in config.steps)
async for b in batch_client.list_batches(
f'test=1 pr={self.number} source_sha={self.source_sha} target_sha={self.target_branch.sha} user:ci',
limit=50,
Expand All @@ -545,11 +553,11 @@ async def _start_build(self, db: Database, batch_client: BatchClient):
async for job in b.jobs():
if job['name']:
name = job['name']
if name in requested_steps_set:
if name in steps_to_check:
step_name = name
else:
stripped = re.sub(r'_\d+$', '', name)
if stripped not in requested_steps_set:
if stripped not in steps_to_check:
continue
step_name = stripped
step_states.setdefault(step_name, []).append(job['state'])
Expand All @@ -558,21 +566,21 @@ async def _start_build(self, db: Database, batch_client: BatchClient):
for step_name, states in step_states.items():
if all(s == 'Success' for s in states):
succeeded_steps[step_name] = b.id
if succeeded_steps.keys() >= requested_steps_set:
if succeeded_steps.keys() >= steps_to_check:
break
tactical_skipped = {s: succeeded_steps[s] for s in requested_step_names if s in succeeded_steps}
requested_step_names = [s for s in requested_step_names if s not in succeeded_steps]
tactical_skipped = {s: succeeded_steps[s] for s in steps_to_check if s in succeeded_steps}
remaining = [s for s in steps_to_check if s not in succeeded_steps]
if len(remaining) < len(steps_to_check):
config = BuildConfiguration(
self,
build_yaml,
scope='test',
requested_step_names=remaining,
pr_labels=frozenset(self.labels),
)
log.info(
f'PR #{self.number} tactical retry: skipping {len(tactical_skipped)} already-succeeded steps: {list(tactical_skipped)}'
)

config = BuildConfiguration(
self,
build_yaml,
scope='test',
requested_step_names=requested_step_names,
pr_labels=frozenset(self.labels),
)
namespace: Optional[str] = config.namespace()
services: List[str] = config.deployed_services()
with open(f'{repo_dir}/ci/test/resources/build.yaml', 'r', encoding='utf-8') as f:
Expand Down
Loading