Skip to content

[None][fix] Exclude post-merge stages from CBTS force-keep filters #14594

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

Merged
tburt-nv merged 2 commits into from
May 28, 2026
Merged

[None][fix] Exclude post-merge stages from CBTS force-keep filters #14594

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7088fbc
[None][fix] Exclude post-merge stages from CBTS force-keep filters
achartier May 26, 2026
6074329
[None][fix] Update CBTS comment to reflect Post-Merge exclusion
achartier May 26, 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
4 changes: 3 additions & 1 deletion jenkins/L0_Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4563,14 +4563,16 @@ def launchTestJobs(pipeline, testFilter)
// CBTS Layer 2: replace `parallelJobsFiltered` with affected stages plus
// PackageSanityCheck (kept iff sanity_required) and PerfSanity (kept iff
// perfsanity_required). Pure -Perf- stages always excluded (own trigger
// model, full-list benchmarks).
// model, full-list benchmarks). Post-Merge stages are never force-kept;
// they only run when explicitly listed in affected_stages.
def cbts = testFilter[(CBTS_RESULT)]
if (cbts != null) {
def affectedSet = (cbts.affected_stages ?: []) as Set
def needsSanity = cbts.sanity_required
def needsPerfSanity = cbts.perfsanity_required
parallelJobsFiltered = parallelJobs.findAll { key, _ ->
if (key =~ /-Perf-/) return false
if (key =~ /Post-Merge/) return affectedSet.contains(key)
return affectedSet.contains(key) ||
(needsSanity && key =~ /PackageSanityCheck/) ||
(needsPerfSanity && key =~ /PerfSanity/)
Expand Down
Loading