From 80318d07de714d060db7dc9784cd8af892fe7fc3 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 18 Sep 2024 11:52:47 -0400 Subject: [PATCH 1/3] Support Leap 15 in unitPackages() Skip-PR-comments: true Signed-off-by: Brian J. Murrell --- vars/unitPackages.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/unitPackages.groovy b/vars/unitPackages.groovy index f20929249..7c36e7eec 100644 --- a/vars/unitPackages.groovy +++ b/vars/unitPackages.groovy @@ -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' From 159f342601a228e24104fa3485273333d684fd0c Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 18 Sep 2024 12:16:07 -0400 Subject: [PATCH 2/3] Add support for running UT on Leap 15 Fix placement of test for skipping EL8 build. Skip-PR-comments: true Signed-off-by: Brian J. Murrell --- vars/skipStage.groovy | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/vars/skipStage.groovy b/vars/skipStage.groovy index 798b3a24f..347843b8c 100644 --- a/vars/skipStage.groovy +++ b/vars/skipStage.groovy @@ -340,25 +340,26 @@ 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) || + skip_stage_pragma('build') || + 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': @@ -368,6 +369,7 @@ 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': @@ -375,6 +377,13 @@ boolean call(Map config = [:]) { 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') || From ec31d83690025019263c9cdf781c02edbc98685c Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 18 Sep 2024 12:18:01 -0400 Subject: [PATCH 3/3] DO NOT LAND Temporarily allow UT to run when build is skipped to debug UT provisioning with Leap 15. Skip-PR-comments: true Signed-off-by: Brian J. Murrell --- vars/skipStage.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/vars/skipStage.groovy b/vars/skipStage.groovy index 347843b8c..31b056527 100644 --- a/vars/skipStage.groovy +++ b/vars/skipStage.groovy @@ -342,7 +342,6 @@ boolean call(Map config = [:]) { case 'Unit Tests': return env.NO_CI_TESTING == 'true' || paramsValue('CI_BUILD_PACKAGES_ONLY', false) || - skip_stage_pragma('build') || rpmTestVersion() != '' || docOnlyChange(target_branch) || skip_stage_pragma('unit-tests')