Skip to content

DAOS-17203 build: Build DAOS RPMs with Leap 15.6. #460

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

Closed
phender wants to merge 7 commits into from
Closed

DAOS-17203 build: Build DAOS RPMs with Leap 15.6. #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b97f2df
DAOS-17203 build: Build DAOS RPMs with Leap 15.6.
phender Mar 3, 2025
315c2e8
Merge branch 'master' into hendersp/DAOS-17203
phender Mar 5, 2025
a00d2b0
Merge branch 'master' into hendersp/DAOS-17203
phender Mar 18, 2025
d20b8ae
Merge remote-tracking branch 'origin/master' into hendersp/DAOS-17203
grom72 Jul 23, 2025
ff01e04
Leap 15.6 requires at least Fedora 42 as build env
grom72 Jul 24, 2025
7be13fa
Merge remote-tracking branch 'origin/master' into hendersp/DAOS-17203
grom72 Apr 1, 2026
e745c43
Simplify Leap 15.x handling
grom72 Apr 1, 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
2 changes: 1 addition & 1 deletion vars/getChrootName.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
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]
}
18 changes: 9 additions & 9 deletions vars/packageBuildingPipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,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') }
Expand All @@ -548,26 +548,26 @@ 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 {
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('<distro>',
'leap15') +
Expand All @@ -584,7 +584,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
Expand All @@ -594,9 +594,9 @@ void call(Map pipeline_args) {
}
always {
scrubSecret(pipeline_args['secret'],
'/var/lib/mock/opensuse-leap-15.5-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.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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions vars/packageBuildingPipelineDAOS.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }
Expand All @@ -549,26 +549,26 @@ 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 {
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('<distro>',
'leap15') +
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions vars/packageBuildingPipelineDAOSTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }
Expand All @@ -552,26 +552,26 @@ 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 {
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('<distro>',
'leap15') +
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 1 addition & 5 deletions vars/parseStageInfo.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,7 @@ Map call(Map config = [:]) {
String pointRelease = leapPart.split('\\.')[0]
String version = "15.${pointRelease}"
result['target'] = 'leap15'
// Special handling for 15.6: provision with 15.5 until mock config is available
// Leap 15.7+ doesn't exist, use sles15.7 instead
String defaultVersion = (pointRelease == '6') ? '15.5' :
(pointRelease.toInteger() >= 7) ? '15.6' : version
result['distro_version'] = cachedCommitPragma('LEAP15-version', defaultVersion)
result['distro_version'] = cachedCommitPragma('LEAP15-version', version)
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
} else if (stage_name.contains('Leap 15')) {
result['target'] = 'leap15'
Expand Down