Skip to content

Support Leap 15 in unitPackages() #445

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Support Leap 15 in unitPackages() #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80318d0
Support Leap 15 in unitPackages()
brianjmurrell Sep 18, 2024
159f342
Add support for running UT on Leap 15
brianjmurrell Sep 18, 2024
ec31d83
DO NOT LAND
brianjmurrell Sep 18, 2024
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
22 changes: 15 additions & 7 deletions vars/skipStage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,25 +340,25 @@ boolean call(Map config = [:]) {
prRepos('leap15') == '') ||
quickBuild()
case 'Unit Tests':
return env.NO_CI_TESTING == 'true' ||
paramsValue('CI_BUILD_PACKAGES_ONLY', false) ||
skip_stage_pragma('build') ||
rpmTestVersion() != '' ||
docOnlyChange(target_branch) ||
skip_build_on_el_gcc(target_branch, '8') ||
skip_stage_pragma('unit-tests')
return env.NO_CI_TESTING == 'true' ||
paramsValue('CI_BUILD_PACKAGES_ONLY', false) ||
rpmTestVersion() != '' ||
docOnlyChange(target_branch) ||
skip_stage_pragma('unit-tests')
case 'NLT':
case 'NLT on CentOS 8':
case 'NLT on EL 8':
case 'NLT on EL 8.8':
return skip_stage_pragma('nlt') ||
quickBuild() ||
skip_build_on_el_gcc(target_branch, '8') ||
stageAlreadyPassed()
case 'Unit Test Bullseye':
case 'Unit Test Bullseye on CentOS 8':
case 'Unit Test Bullseye on EL 8':
case 'Unit Test Bullseye on EL 8.8':
return skip_stage_pragma('bullseye', 'true') ||
skip_build_on_el_gcc(target_branch, '8') ||
stageAlreadyPassed()
case 'Unit Test bdev with memcheck on EL 8':
case 'Unit Test bdev with memcheck on EL 8.8':
Expand All @@ -368,13 +368,21 @@ boolean call(Map config = [:]) {
case 'Unit Test with memcheck':
return !paramsValue('CI_UNIT_TEST_MEMCHECK', true) ||
skip_stage_pragma('unit-test-memcheck') ||
skip_build_on_el_gcc(target_branch, '8') ||
stageAlreadyPassed()
case 'Unit Test':
case 'Unit Test on CentOS 8':
case 'Unit Test on EL 8':
case 'Unit Test on EL 8.8':
case 'Unit Test bdev on EL 8':
case 'Unit Test bdev on EL 8.8':
return !paramsValue('CI_UNIT_TEST', true) ||
skip_stage_pragma('unit-test') ||
skip_stage_pragma('run_test') ||
skip_build_on_el_gcc(target_branch, '8') ||
stageAlreadyPassed()
case 'Unit Test on Leap 15':
case 'Unit Test on Leap 15.5':
return !paramsValue('CI_UNIT_TEST', true) ||
skip_stage_pragma('unit-test') ||
skip_stage_pragma('run_test') ||
Expand Down
2 changes: 1 addition & 1 deletion vars/unitPackages.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ String call() {
String target = stage_info['target']
boolean quick_build = quickBuild()

if (target.startsWith('centos') || target.startsWith('el')) {
if (target.startsWith('centos') || target.startsWith('el') || target.startsWith('leap')) {
if (quick_build) {
// the script run below will read from this file
unstash target + '-required-mercury-rpm-version'
Expand Down