From b97f2df1816624737ec19eca93353c79cdc0323a Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Mon, 3 Mar 2025 09:52:46 -0500 Subject: [PATCH 1/2] DAOS-17203 build: Build DAOS RPMs with Leap 15.6. Use the opensuse-leap-15.6-x86_64.cfg mock config to build DAOS RPMs. Signed-off-by: Phil Henderson --- vars/getChrootName.groovy | 2 +- vars/packageBuildingPipeline.groovy | 16 ++++++++-------- vars/packageBuildingPipelineDAOS.groovy | 14 +++++++------- vars/packageBuildingPipelineDAOSTest.groovy | 14 +++++++------- vars/parseStageInfo.groovy | 3 +-- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/vars/getChrootName.groovy b/vars/getChrootName.groovy index f47c9e9ad..070654701 100644 --- a/vars/getChrootName.groovy +++ b/vars/getChrootName.groovy @@ -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.5-x86_64', + 'leap15': 'opensuse-leap-15.6-x86_64', 'ubuntu2004': ''][distro] } diff --git a/vars/packageBuildingPipeline.groovy b/vars/packageBuildingPipeline.groovy index d63b1679e..ef32a1791 100644 --- a/vars/packageBuildingPipeline.groovy +++ b/vars/packageBuildingPipeline.groovy @@ -535,7 +535,7 @@ void call(Map pipeline_args) { } } } //stage('Build RPM on EL 9') - stage('Build RPM on Leap 15.4') { + stage('Build RPM on Leap 15.6') { when { beforeAgent true expression { !skipStage() && distros.contains('leap15') } @@ -555,19 +555,19 @@ void call(Map pipeline_args) { sh label: 'Build package', script: '''rm -rf artifacts/leap15/ mkdir -p artifacts/leap15/ - make CHROOT_NAME="opensuse-leap-15.4-x86_64" ''' + + make CHROOT_NAME="opensuse-leap-15.6-x86_64" ''' + 'DISTRO_VERSION=' + parseStageInfo()['distro_version'] + ' ' + pipeline_args.get('make args', '') + ' chrootbuild ' + pipeline_args.get('add_make_targets', '') } post { success { - rpmlintMockResults('opensuse-leap-15.4-x86_64', + rpmlintMockResults('opensuse-leap-15.6-x86_64', pipeline_args.get('rpmlint_rpms_allow_errors', false), pipeline_args.get('rpmlint_rpms_skip', false), pipeline_args.get('make args', '')) sh label: 'Collect artifacts', - script: '''(cd /var/lib/mock/opensuse-leap-15.4-x86_64/result/ && + script: '''(cd /var/lib/mock/opensuse-leap-15.6-x86_64/result/ && cp -r . $OLDPWD/artifacts/leap15/)\n''' + pipeline_args.get('add_archiving_cmds', '').replace('', 'leap15') + @@ -584,7 +584,7 @@ void call(Map pipeline_args) { } unsuccessful { sh label: 'Build Log', - script: '''mockroot=/var/lib/mock/opensuse-leap-15.4-x86_64 + script: '''mockroot=/var/lib/mock/opensuse-leap-15.6-x86_64 ls -l $mockroot/result/ cat $mockroot/result/{root,build}.log artdir=$PWD/artifacts/leap15 @@ -594,9 +594,9 @@ void call(Map pipeline_args) { } always { scrubSecret(pipeline_args['secret'], - '/var/lib/mock/opensuse-leap-15.4-x86_64/result/build.log') + '/var/lib/mock/opensuse-leap-15.6-x86_64/result/build.log') sh label: 'Collect config.log(s)', - script: '(if cd /var/lib/mock/opensuse-leap-15.4-x86_64/root/builddir/build/' + + script: '(if cd /var/lib/mock/opensuse-leap-15.6-x86_64/root/builddir/build/' + '''BUILD/*/; then find . -name configure -printf %h\\\\n | \ while read dir; do @@ -613,7 +613,7 @@ void call(Map pipeline_args) { archiveArtifacts artifacts: 'artifacts/leap15/**' } } - } //stage('Build RPM on Leap 15') + } //stage('Build RPM on Leap 15.6') stage('Build DEB on Ubuntu 20.04') { when { beforeAgent true diff --git a/vars/packageBuildingPipelineDAOS.groovy b/vars/packageBuildingPipelineDAOS.groovy index 3353f6d86..89240cd21 100644 --- a/vars/packageBuildingPipelineDAOS.groovy +++ b/vars/packageBuildingPipelineDAOS.groovy @@ -536,7 +536,7 @@ void call(Map pipeline_args) { } } } //stage('Build RPM on EL 9') - stage('Build RPM on Leap 15.4') { + stage('Build RPM on Leap 15.6') { when { beforeAgent true expression { !skipStage() && distros.contains('leap15') } @@ -556,19 +556,19 @@ void call(Map pipeline_args) { sh label: 'Build package', script: '''rm -rf artifacts/leap15/ mkdir -p artifacts/leap15/ - make CHROOT_NAME="opensuse-leap-15.4-x86_64" ''' + + make CHROOT_NAME="opensuse-leap-15.6-x86_64" ''' + 'DISTRO_VERSION=' + parseStageInfo()['distro_version'] + ' ' + pipeline_args.get('make args', '') + ' chrootbuild ' + pipeline_args.get('add_make_targets', '') } post { success { - rpmlintMockResults('opensuse-leap-15.4-x86_64', + rpmlintMockResults('opensuse-leap-15.6-x86_64', pipeline_args.get('rpmlint_rpms_allow_errors', false), pipeline_args.get('rpmlint_rpms_skip', false), pipeline_args.get('make args', '')) sh label: 'Collect artifacts', - script: '''(cd /var/lib/mock/opensuse-leap-15.4-x86_64/result/ && + script: '''(cd /var/lib/mock/opensuse-leap-15.6-x86_64/result/ && cp -r . $OLDPWD/artifacts/leap15/)\n''' + pipeline_args.get('add_archiving_cmds', '').replace('', 'leap15') + @@ -585,7 +585,7 @@ void call(Map pipeline_args) { } unsuccessful { sh label: 'Build Log', - script: '''mockroot=/var/lib/mock/opensuse-leap-15.4-x86_64 + script: '''mockroot=/var/lib/mock/opensuse-leap-15.6-x86_64 ls -l $mockroot/result/ cat $mockroot/result/{root,build}.log artdir=$PWD/artifacts/leap15 @@ -595,7 +595,7 @@ void call(Map pipeline_args) { } always { sh label: 'Collect config.log(s)', - script: '(if cd /var/lib/mock/opensuse-leap-15.4-x86_64/root/builddir/build/' + + script: '(if cd /var/lib/mock/opensuse-leap-15.6-x86_64/root/builddir/build/' + '''BUILD/*/; then find . -name configure -printf %h\\\\n | \ while read dir; do @@ -612,7 +612,7 @@ void call(Map pipeline_args) { archiveArtifacts artifacts: 'artifacts/leap15/**' } } - } //stage('Build RPM on Leap 15') + } //stage('Build RPM on Leap 15.6') stage('Build DEB on Ubuntu 20.04') { when { beforeAgent true diff --git a/vars/packageBuildingPipelineDAOSTest.groovy b/vars/packageBuildingPipelineDAOSTest.groovy index a7e657f42..ad0fc8377 100644 --- a/vars/packageBuildingPipelineDAOSTest.groovy +++ b/vars/packageBuildingPipelineDAOSTest.groovy @@ -539,7 +539,7 @@ void call(Map pipeline_args) { } } } //stage('Build RPM on EL 9') - stage('Build RPM on Leap 15.5') { + stage('Build RPM on Leap 15.6') { when { beforeAgent true expression { !skipStage() && distros.contains('leap15') } @@ -559,19 +559,19 @@ void call(Map pipeline_args) { sh label: 'Build package', script: '''rm -rf artifacts/leap15/ mkdir -p artifacts/leap15/ - make CHROOT_NAME="opensuse-leap-15.5-x86_64" ''' + + make CHROOT_NAME="opensuse-leap-15.6-x86_64" ''' + 'DISTRO_VERSION=' + parseStageInfo()['distro_version'] + ' ' + pipeline_args.get('make args', '') + ' chrootbuild ' + pipeline_args.get('add_make_targets', '') } post { success { - rpmlintMockResults('opensuse-leap-15.5-x86_64', + rpmlintMockResults('opensuse-leap-15.6-x86_64', pipeline_args.get('rpmlint_rpms_allow_errors', false), pipeline_args.get('rpmlint_rpms_skip', false), pipeline_args.get('make args', '')) sh label: 'Collect artifacts', - script: '''(cd /var/lib/mock/opensuse-leap-15.5-x86_64/result/ && + script: '''(cd /var/lib/mock/opensuse-leap-15.6-x86_64/result/ && cp -r . $OLDPWD/artifacts/leap15/)\n''' + pipeline_args.get('add_archiving_cmds', '').replace('', 'leap15') + @@ -588,7 +588,7 @@ void call(Map pipeline_args) { } unsuccessful { sh label: 'Build Log', - script: '''mockroot=/var/lib/mock/opensuse-leap-15.5-x86_64 + script: '''mockroot=/var/lib/mock/opensuse-leap-15.6-x86_64 ls -l $mockroot/result/ cat $mockroot/result/{root,build}.log artdir=$PWD/artifacts/leap15 @@ -598,7 +598,7 @@ void call(Map pipeline_args) { } always { sh label: 'Collect config.log(s)', - script: '(if cd /var/lib/mock/opensuse-leap-15.5-x86_64/root/builddir/build/' + + script: '(if cd /var/lib/mock/opensuse-leap-15.6-x86_64/root/builddir/build/' + '''BUILD/*/; then find . -name configure -printf %h\\\\n | \ while read dir; do @@ -615,7 +615,7 @@ void call(Map pipeline_args) { archiveArtifacts artifacts: 'artifacts/leap15/**' } } - } //stage('Build RPM on Leap 15.5') + } //stage('Build RPM on Leap 15.6') stage('Build DEB on Ubuntu 20.04') { when { beforeAgent true diff --git a/vars/parseStageInfo.groovy b/vars/parseStageInfo.groovy index bcc43a9fb..8a4d37927 100755 --- a/vars/parseStageInfo.groovy +++ b/vars/parseStageInfo.groovy @@ -103,8 +103,7 @@ Map call(Map config = [:]) { new_ci_target = cachedCommitPragma('LEAP15-target', result['target']) } else if (stage_name.contains('Leap 15.6')) { result['target'] = 'leap15' - // Until a mock opensuse-leap-15.6-x86-64.cfg is available provision with 15.5 - result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5') + 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' From ff01e044bb008d912bbc89745745b45c528b19e5 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 24 Jul 2025 11:37:16 +0200 Subject: [PATCH 2/2] Leap 15.6 requires at least Fedora 42 as build env Signed-off-by: Tomasz Gromadzki --- vars/packageBuildingPipeline.groovy | 2 +- vars/packageBuildingPipelineDAOS.groovy | 2 +- vars/packageBuildingPipelineDAOSTest.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/packageBuildingPipeline.groovy b/vars/packageBuildingPipeline.groovy index a05ff6bf1..4a54b4b04 100644 --- a/vars/packageBuildingPipeline.groovy +++ b/vars/packageBuildingPipeline.groovy @@ -548,7 +548,7 @@ void call(Map pipeline_args) { ' --cap-add=SYS_ADMIN' + ' --privileged=true' + ' -v /scratch:/scratch' - additionalBuildArgs dockerBuildArgs() + '--build-arg FVERSION=37' + additionalBuildArgs dockerBuildArgs() + '--build-arg FVERSION=42' } } steps { diff --git a/vars/packageBuildingPipelineDAOS.groovy b/vars/packageBuildingPipelineDAOS.groovy index 8f7ce3a92..dd1c9df48 100644 --- a/vars/packageBuildingPipelineDAOS.groovy +++ b/vars/packageBuildingPipelineDAOS.groovy @@ -549,7 +549,7 @@ void call(Map pipeline_args) { ' --cap-add=SYS_ADMIN' + ' --privileged=true' + ' -v /scratch:/scratch' - additionalBuildArgs dockerBuildArgs() + '--build-arg FVERSION=37' + additionalBuildArgs dockerBuildArgs() + '--build-arg FVERSION=42' } } steps { diff --git a/vars/packageBuildingPipelineDAOSTest.groovy b/vars/packageBuildingPipelineDAOSTest.groovy index 265075600..ff94248eb 100644 --- a/vars/packageBuildingPipelineDAOSTest.groovy +++ b/vars/packageBuildingPipelineDAOSTest.groovy @@ -552,7 +552,7 @@ void call(Map pipeline_args) { ' --cap-add=SYS_ADMIN' + ' --privileged=true' + ' -v /scratch:/scratch' - additionalBuildArgs dockerBuildArgs() + '--build-arg FVERSION=37' + additionalBuildArgs dockerBuildArgs() + '--build-arg FVERSION=42' } } steps {