Skip to content

fix(elliott): broaden cutoff filter to accept any post-fix status at timestamp #3274

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
joepvd wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(elliott): broaden cutoff filter to accept any post-fix status at timestamp #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a93fe8c
fix(elliott): broaden cutoff filter to accept any post-fix status at …
joepvd Aug 17, 2026
7dd8c77
fix(pyartcd): move sweep_bugs to after rebase, before builds
joepvd Aug 17, 2026
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
12 changes: 7 additions & 5 deletions elliott/elliottlib/cli/find_bugs_sweep_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,15 +273,17 @@ async def get_bugs_sweep(runtime: Runtime, find_bugs_obj, bug_tracker, filter_at
sweep_cutoff_timestamp = await get_sweep_cutoff_timestamp(runtime)
if sweep_cutoff_timestamp:
utc_ts = datetime.fromtimestamp(sweep_cutoff_timestamp, tz=timezone.utc)
logger.info(
f"Filtering bugs that have changed ({len(bugs)}) to one of the desired statuses before the "
f"cutoff time {utc_ts}..."
)
logger.info(f"Filtering bugs that were in a post-fix state ({len(bugs)}) at the cutoff time {utc_ts}...")
# The initial search already ensures bugs are currently VERIFIED (or whatever
# find_bugs_obj.status requires). For the historical cutoff check we use a broader
# set: any status indicating the bug was already fixed at the cutoff time qualifies,
# even if it had not yet been verified.
cutoff_eligible_statuses = {'ON_QA', 'VERIFIED', 'RELEASE_PENDING', 'CLOSED'}
qualified_bugs = []
unqualified_bugs = []
for chunk_of_bugs in chunk(bugs, constants.BUG_LOOKUP_CHUNK_SIZE):
qualified_bugs_chunk = bug_tracker.filter_bugs_by_cutoff_event(
chunk_of_bugs, find_bugs_obj.status, sweep_cutoff_timestamp, verbose=runtime.debug
chunk_of_bugs, cutoff_eligible_statuses, sweep_cutoff_timestamp, verbose=runtime.debug
)
qualified_bugs.extend(qualified_bugs_chunk)
not_qualified = {b.id for b in chunk_of_bugs} - {b.id for b in qualified_bugs_chunk}
Expand Down
12 changes: 10 additions & 2 deletions pyartcd/pyartcd/pipelines/ocp4_konflux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,9 @@ async def mirror_streams_to_ci(self):

async def sweep_bugs(self):
"""
Find MODIFIED bugs for the target-releases, and set them to ON_QA
Find MODIFIED bugs for the target-releases, and set them to ON_QA.
Called after rebase so that ON_QA is set before builds complete, making
the bug status a reliable indicator that the fix was included in the rebase.
Comment on lines +624 to +626

@coderabbitai coderabbitai Bot Aug 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Gate sweep_bugs() on an eligible rebase.

rebase_images() can return without rebasing when no images are selected or skip_rebase is enabled. It also returns after handling partial rebase failures. The unconditional call at Lines [906-910] then sweeps the whole group and can move MODIFIED bugs to ON_QA even when their fixes were not rebased.

Return the successfully rebased scope from rebase_images() and use it to limit the sweep, or skip the sweep unless the required rebase completed. Update the documentation to match this behavior. Add regression tests for no-image builds, skipped rebases, partial failures, and ONLY/EXCEPT strategies.

Also applies to: 906-911, 1079-1079

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pyartcd/pyartcd/pipelines/ocp4_konflux.py` around lines 624 - 626, Gate
sweep_bugs() on a completed, eligible rebase rather than calling it
unconditionally after rebase_images(). Update rebase_images() to return the
successfully rebased scope, account for no-image builds, skip_rebase, partial
failures, and ONLY/EXCEPT strategies, and pass that scope to limit bug updates
or skip sweeping when no valid scope exists. Revise the surrounding
documentation and add regression tests covering each listed scenario.

"""

if self.assembly != 'stream':
Expand Down Expand Up @@ -901,6 +903,12 @@ async def rebase_and_build_images(self):

await self.rebase_images(f"v{self.version}.0", self.release)

# Sweep bugs to ON_QA right after rebase: at this point we've pulled all source that
# includes the fixes, so any MODIFIED bug for this release has been incorporated.
# Doing this before build_images ensures ON_QA is set before basis.time (build completion),
# making the cutoff filter in elliott find-bugs:sweep reliable.
await self.sweep_bugs()

# ART-14540: Notify component owners about missing branch protection
record_log_path = Path(self.runtime.doozer_working) / "record.log"
if record_log_path.exists():
Expand Down Expand Up @@ -1068,7 +1076,7 @@ async def _run_pipeline(self):
await self.sync_images()

if uses_konflux_imagestream_override(self.version):
await self.sweep_bugs()
# sweep_bugs (MODIFIED → ON_QA) now runs in rebase_and_build_images, after rebase.
await self.sweep_golang_bugs()
if not self.runtime.dry_run:
await self.sweep_second_fix_bugs()
Expand Down
Loading