Skip to content
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

DAOS-16500 build: Add support for Leap 15.6 #450

Merged
merged 3 commits into from
Dec 19, 2024
Merged

DAOS-16500 build: Add support for Leap 15.6 #450

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3f0e44
DAOS-16500 build: Add support for Leap 15.6
phender Dec 4, 2024
ed63dc8
Updating FVERSION=41
phender Dec 4, 2024
008161b
Retaining build with Leap 15.5
phender Dec 4, 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
14 changes: 7 additions & 7 deletions vars/distroVersion.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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')
*/
6 changes: 3 additions & 3 deletions vars/getChrootName.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// vars/getChrootName.groovy

/**
* getChrooName.groovy
* getChrootName.groovy
*
* getChrooName variable
* getChrootName variable
*/


Expand All @@ -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.6-x86_64',
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
'ubuntu2004': ''][distro]

}
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 @@ -538,7 +538,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') {
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
when {
beforeAgent true
expression { !skipStage() && distros.contains('leap15') }
Expand All @@ -551,26 +551,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=41'
}
}
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" ''' +
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
'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',
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
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/ &&
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
cp -r . $OLDPWD/artifacts/leap15/)\n''' +
pipeline_args.get('add_archiving_cmds', '').replace('<distro>',
'leap15') +
Expand All @@ -587,7 +587,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
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
ls -l $mockroot/result/
cat $mockroot/result/{root,build}.log
artdir=$PWD/artifacts/leap15
Expand All @@ -597,7 +597,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/' +
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
'''BUILD/*/; then
find . -name configure -printf %h\\\\n | \
while read dir; do
Expand All @@ -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.6')
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
stage('Build DEB on Ubuntu 20.04') {
when {
beforeAgent true
Expand Down
4 changes: 4 additions & 0 deletions vars/parseStageInfo.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
16 changes: 12 additions & 4 deletions vars/skipStage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down Expand Up @@ -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) &&
Expand All @@ -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) &&
Expand All @@ -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') ||
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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':
Expand All @@ -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' ||
Expand Down