From 4b067c289a78cc99a9e6b91b3c7f098524864dab Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Thu, 19 Dec 2024 15:19:17 -0500 Subject: [PATCH] DAOS-16500 build: Add support for Leap 15.6 (#450) Signed-off-by: Phil Henderson --- vars/distroVersion.groovy | 14 +++++++------- vars/getChrootName.groovy | 6 +++--- vars/packageBuildingPipelineDAOSTest.groovy | 2 +- vars/parseStageInfo.groovy | 4 ++++ vars/skipStage.groovy | 16 ++++++++++++---- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index 0722fd3b5..981194ac5 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -35,16 +35,16 @@ String call(String distro, String branch) { '2.6': '8.8'], 'el9': ['master': '9.2', '2.6': '9.2'], - 'leap15': ['master': '15.5', - '2.4': '15.5', - '2.6': '15.5'], + 'leap15': ['master': '15.6', + '2.4': '15.6', + '2.6': '15.6'], 'ubuntu20': ['master': '20.04']][distro][branch] } /* groovylint-disable-next-line CompileStatic */ -assert(call('leap15', '2.4') == '15.5') -assert(call('leap15', '2.6') == '15.5') -assert(call('leap15', 'master') == '15.5') +assert(call('leap15', '2.4') == '15.6') +assert(call('leap15', '2.6') == '15.6') +assert(call('leap15', 'master') == '15.6') assert(call('el8', '2.4') == '8.8') assert(call('el8', '2.6') == '8.8') assert(call('el8', 'master') == '8.8') @@ -76,6 +76,6 @@ String releaseBranch() { return 'release/2.4' } -assert(call('leap15') == '15.5') +assert(call('leap15') == '15.6') assert(call('el8') == '8.8') */ diff --git a/vars/getChrootName.groovy b/vars/getChrootName.groovy index 7da0b0041..f47c9e9ad 100644 --- a/vars/getChrootName.groovy +++ b/vars/getChrootName.groovy @@ -1,9 +1,9 @@ // vars/getChrootName.groovy /** - * getChrooName.groovy + * getChrootName.groovy * - * getChrooName variable + * getChrootName variable */ @@ -14,7 +14,7 @@ String call(String distro) { return[ 'centos7': 'centos+epel-7-x86_64', 'el8': 'rocky+epel-8-x86_64', - 'leap15': 'opensuse-leap-15.3-x86_64', + 'leap15': 'opensuse-leap-15.5-x86_64', 'ubuntu2004': ''][distro] } diff --git a/vars/packageBuildingPipelineDAOSTest.groovy b/vars/packageBuildingPipelineDAOSTest.groovy index c5d9d8f48..71e895701 100644 --- a/vars/packageBuildingPipelineDAOSTest.groovy +++ b/vars/packageBuildingPipelineDAOSTest.groovy @@ -614,7 +614,7 @@ void call(Map pipeline_args) { archiveArtifacts artifacts: 'artifacts/leap15/**' } } - } //stage('Build RPM on Leap 15') + } //stage('Build RPM on Leap 15.5') stage('Build DEB on Ubuntu 20.04') { when { beforeAgent true diff --git a/vars/parseStageInfo.groovy b/vars/parseStageInfo.groovy index c73045e91..8a4d37927 100755 --- a/vars/parseStageInfo.groovy +++ b/vars/parseStageInfo.groovy @@ -101,6 +101,10 @@ Map call(Map config = [:]) { result['target'] = 'leap15' result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5') new_ci_target = cachedCommitPragma('LEAP15-target', result['target']) + } else if (stage_name.contains('Leap 15.6')) { + result['target'] = 'leap15' + result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.6') + new_ci_target = cachedCommitPragma('LEAP15-target', result['target']) } else if (stage_name.contains('Leap 15')) { result['target'] = 'leap15' result['distro_version'] = cachedCommitPragma('LEAP15-version', diff --git a/vars/skipStage.groovy b/vars/skipStage.groovy index 97fe0e12d..0e628ec3b 100644 --- a/vars/skipStage.groovy +++ b/vars/skipStage.groovy @@ -213,6 +213,7 @@ boolean call(Map config = [:]) { case 'Build RPM on Leap 15': case 'Build RPM on Leap 15.4': case 'Build RPM on Leap 15.5': + case 'Build RPM on Leap 15.6': return paramsValue('CI_RPM_leap15_NOBUILD', false) || target_branch =~ branchTypeRE('weekly') || (docOnlyChange(target_branch) && @@ -303,6 +304,7 @@ boolean call(Map config = [:]) { case 'Build on Leap 15 with Clang': case 'Build on Leap 15.4 with Clang': case 'Build on Leap 15.5 with Clang': + case 'Build on Leap 15.6 with Clang': return paramsValue('CI_BUILD_PACKAGES_ONLY', false) || skip_build_on_landing_branch(target_branch) || (docOnlyChange(target_branch) && @@ -325,6 +327,7 @@ boolean call(Map config = [:]) { case 'Build on Leap 15': case 'Build on Leap 15.4': case 'Build on Leap 15.5': + case 'Build on Leap 15.6': return paramsValue('CI_BUILD_PACKAGES_ONLY', false) || skip_stage_pragma('build-leap15-gcc') || (docOnlyChange(target_branch) && @@ -333,6 +336,7 @@ boolean call(Map config = [:]) { case 'Build on Leap 15 with Intel-C and TARGET_PREFIX': case 'Build on Leap 15.4 with Intel-C and TARGET_PREFIX': case 'Build on Leap 15.5 with Intel-C and TARGET_PREFIX': + case 'Build on Leap 15.6 with Intel-C and TARGET_PREFIX': return paramsValue('CI_BUILD_PACKAGES_ONLY', false) || target_branch =~ branchTypeRE('weekly') || skip_stage_pragma('build-leap15-icc') || @@ -422,6 +426,7 @@ boolean call(Map config = [:]) { case 'Functional on Leap 15': case 'Functional on Leap 15.4': case 'Functional on Leap 15.5': + case 'Functional on Leap 15.6': return skip_ftest('leap15', target_branch, tags) case 'Functional on Ubuntu 20.04': /* we don't do any testing on Ubuntu yet @@ -508,16 +513,18 @@ boolean call(Map config = [:]) { skip_stage_pragma('test-leap-15-rpms', 'true') || stageAlreadyPassed() case 'Test RPMs on Leap 15.4': - return !paramsValue('CI_RPMS_leap15.4_TEST', true) || + case 'Test RPMs on Leap 15.5': + case 'Test RPMs on Leap 15.6': + return !paramsValue('CI_RPMS_leap15_TEST', true) || target_branch =~ branchTypeRE('weekly') || skip_stage_pragma('build-leap15-rpm') || skip_stage_pragma('test') || skip_stage_pragma('test-rpms') || - skip_stage_pragma('test-leap-15.4-rpms', 'true') || + skip_stage_pragma('test-leap-15-rpms', 'true') || docOnlyChange(target_branch) || (quickFunctional() && - !paramsValue('CI_RPMS_leap15_4_TEST', true) && - !run_default_skipped_stage('test-leap-15.4-rpms')) || + !paramsValue('CI_RPMS_leap15_TEST', true) && + !run_default_skipped_stage('test-leap-15-rpms')) || (rpmTestVersion() != '') || stageAlreadyPassed() case 'Test Packages': @@ -530,6 +537,7 @@ boolean call(Map config = [:]) { case 'Scan Leap 15 RPMs': case 'Scan Leap 15.4 RPMs': case 'Scan Leap 15.5 RPMs': + case 'Scan Leap 15.6 RPMs': return skip_scan_rpms('leap15', target_branch) case 'Test Hardware': return env.NO_CI_TESTING == 'true' ||