Skip to content

SRE-3636 ci: Adapt pipeline-lib to the latest el9.7 Jenkins file #496

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
grom72 merged 7 commits into from
Apr 20, 2026
+5 −18
Merged

SRE-3636 ci: Adapt pipeline-lib to the latest el9.7 Jenkins file #496

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f1a1a5
Adapt pipeline-lib to the latest el9.7 Jenkins file
osalyk Mar 13, 2026
7d1a29f
Merge remote-tracking branch 'origin/master' into osalyk/SRE-3636
osalyk Mar 18, 2026
2fa4732
Adapt pipeline-lib to the latest Jenkins file
osalyk Mar 19, 2026
dc817b4
Merge remote-tracking branch 'origin/master' into osalyk/SRE-3636
grom72 Apr 8, 2026
bdd0262
Merge remote-tracking branch 'origin/master' into osalyk/SRE-3636
grom72 Apr 10, 2026
d56e729
Final tuning
grom72 Apr 14, 2026
f9472a4
Missing pragma to skip Test RPMs on EL 9.6
grom72 Apr 20, 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
23 changes: 5 additions & 18 deletions vars/skipStage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ boolean call(Map config = [:]) {
prRepos('el8') == '') ||
quickBuild()
case 'Build on EL 9':
case 'Build on EL 9.7':
return skip_build_on_el_gcc(target_branch, '9') ||
(docOnlyChange(target_branch) &&
prRepos('el9') == '') ||
Expand Down Expand Up @@ -353,8 +352,6 @@ boolean call(Map config = [:]) {
case 'NLT on CentOS 8':
case 'NLT on EL 8':
case 'NLT on EL 8.8':
case 'NLT on EL 9':
case 'NLT on EL 9.7':
return skip_stage_pragma('nlt') ||
quickBuild() ||
stageAlreadyPassed()
Expand All @@ -370,10 +367,6 @@ boolean call(Map config = [:]) {
case 'Unit Test with memcheck on CentOS 8':
case 'Unit Test with memcheck on EL 8':
case 'Unit Test with memcheck on EL 8.8':
case 'Unit Test with memcheck on EL 9':
case 'Unit Test with memcheck on EL 9.7':
case 'Unit Test bdev with memcheck on EL 9':
case 'Unit Test bdev with memcheck on EL 9.7':
case 'Unit Test with memcheck':
return !paramsValue('CI_UNIT_TEST_MEMCHECK', true) ||
skip_stage_pragma('unit-test-memcheck') ||
Expand All @@ -385,10 +378,6 @@ boolean call(Map config = [:]) {
case 'Unit Test bdev':
case 'Unit Test bdev on EL 8':
case 'Unit Test bdev on EL 8.8':
case 'Unit Test on EL 9':
case 'Unit Test on EL 9.7':
case 'Unit Test bdev on EL 9':
case 'Unit Test bdev on EL 9.7':
return !paramsValue('CI_UNIT_TEST', true) ||
skip_stage_pragma('unit-test') ||
skip_stage_pragma('run_test') ||
Expand Down Expand Up @@ -427,15 +416,11 @@ boolean call(Map config = [:]) {
case 'Functional on EL 8 with Valgrind':
case 'Functional on EL 8.8 with Valgrind':
return skip_ftest_valgrind('el8', target_branch, tags)
case 'Functional on EL 9 with Valgrind':
case 'Functional on EL 9.7 with Valgrind':
return skip_ftest_valgrind('el9', target_branch, tags)
case 'Functional on CentOS 8':
case 'Functional on EL 8':
case 'Functional on EL 8.8':
return skip_ftest('el8', target_branch, tags)
case 'Functional on EL 9':
case 'Functional on EL 9.7':
return skip_ftest('el9', target_branch, tags)
case 'Functional on Leap 15':
case 'Functional on Leap 15.4':
Expand All @@ -450,8 +435,6 @@ boolean call(Map config = [:]) {
case 'Fault injection testing on CentOS 8':
case 'Fault injection testing on EL 8':
case 'Fault injection testing on EL 8.8':
case 'Fault injection testing on EL 9':
case 'Fault injection testing on EL 9.7':
return skip_stage_pragma('fault-injection-test') ||
!paramsValue('CI_FI_TEST', true) ||
!paramsValue('CI_FI_el8_TEST', true) || /* release/2.6 Jenkinsfile still uses CI_FI_el8_TEST */
Expand Down Expand Up @@ -536,14 +519,18 @@ boolean call(Map config = [:]) {
(rpmTestVersion() != '') ||
stageAlreadyPassed()
case 'Test RPMs on EL':
case 'Test RPMs on EL 9.6':
return !paramsValue('CI_TEST_EL_RPMs', true) ||
(paramsValue('CI_RPM_TEST_VERSION', '') != '') ||
target_branch =~ branchTypeRE('weekly') ||
skip_stage_pragma('build-el9-gcc') ||
skip_stage_pragma('test') ||
skip_stage_pragma('test-rpms') ||
skip_stage_pragma('test-el-9-rpms', 'true') ||
docOnlyChange(target_branch) ||
(quickFunctional() &&
!paramsValue('CI_TEST_EL_RPMs', true)) ||
!paramsValue('CI_TEST_EL_RPMs', true) &&
!run_default_skipped_stage('test-el-9-rpms')) ||
(rpmTestVersion() != '') ||
stageAlreadyPassed()
case 'Test Leap 15 RPMs':
Expand Down