Skip to content

Commit d2749f9

Browse files
phenderphender
committed
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 <[email protected]>
1 parent b3c8580 commit d2749f9

5 files changed

+24
-25
lines changed

‎vars/getChrootName.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ String call(String distro) {
1414

1515
return[ 'centos7': 'centos+epel-7-x86_64',
1616
'el8': 'rocky+epel-8-x86_64',
17-
'leap15': 'opensuse-leap-15.5-x86_64',
17+
'leap15': 'opensuse-leap-15.6-x86_64',
1818
'ubuntu2004': ''][distro]
1919

2020
}

‎vars/packageBuildingPipeline.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ void call(Map pipeline_args) {
535535
}
536536
}
537537
} //stage('Build RPM on EL 9')
538-
stage('Build RPM on Leap 15.4') {
538+
stage('Build RPM on Leap 15.6') {
539539
when {
540540
beforeAgent true
541541
expression { !skipStage() && distros.contains('leap15') }
@@ -555,19 +555,19 @@ void call(Map pipeline_args) {
555555
sh label: 'Build package',
556556
script: '''rm -rf artifacts/leap15/
557557
mkdir -p artifacts/leap15/
558-
make CHROOT_NAME="opensuse-leap-15.4-x86_64" ''' +
558+
make CHROOT_NAME="opensuse-leap-15.6-x86_64" ''' +
559559
'DISTRO_VERSION=' + parseStageInfo()['distro_version'] + ' ' +
560560
pipeline_args.get('make args', '') + ' chrootbuild ' +
561561
pipeline_args.get('add_make_targets', '')
562562
}
563563
post {
564564
success {
565-
rpmlintMockResults('opensuse-leap-15.4-x86_64',
565+
rpmlintMockResults('opensuse-leap-15.6-x86_64',
566566
pipeline_args.get('rpmlint_rpms_allow_errors', false),
567567
pipeline_args.get('rpmlint_rpms_skip', false),
568568
pipeline_args.get('make args', ''))
569569
sh label: 'Collect artifacts',
570-
script: '''(cd /var/lib/mock/opensuse-leap-15.4-x86_64/result/ &&
570+
script: '''(cd /var/lib/mock/opensuse-leap-15.6-x86_64/result/ &&
571571
cp -r . $OLDPWD/artifacts/leap15/)\n''' +
572572
pipeline_args.get('add_archiving_cmds', '').replace('<distro>',
573573
'leap15') +
@@ -584,7 +584,7 @@ void call(Map pipeline_args) {
584584
}
585585
unsuccessful {
586586
sh label: 'Build Log',
587-
script: '''mockroot=/var/lib/mock/opensuse-leap-15.4-x86_64
587+
script: '''mockroot=/var/lib/mock/opensuse-leap-15.6-x86_64
588588
ls -l $mockroot/result/
589589
cat $mockroot/result/{root,build}.log
590590
artdir=$PWD/artifacts/leap15
@@ -594,9 +594,9 @@ void call(Map pipeline_args) {
594594
}
595595
always {
596596
scrubSecret(pipeline_args['secret'],
597-
'/var/lib/mock/opensuse-leap-15.4-x86_64/result/build.log')
597+
'/var/lib/mock/opensuse-leap-15.6-x86_64/result/build.log')
598598
sh label: 'Collect config.log(s)',
599-
script: '(if cd /var/lib/mock/opensuse-leap-15.4-x86_64/root/builddir/build/' +
599+
script: '(if cd /var/lib/mock/opensuse-leap-15.6-x86_64/root/builddir/build/' +
600600
'''BUILD/*/; then
601601
find . -name configure -printf %h\\\\n | \
602602
while read dir; do
@@ -613,7 +613,7 @@ void call(Map pipeline_args) {
613613
archiveArtifacts artifacts: 'artifacts/leap15/**'
614614
}
615615
}
616-
} //stage('Build RPM on Leap 15')
616+
} //stage('Build RPM on Leap 15.6')
617617
stage('Build DEB on Ubuntu 20.04') {
618618
when {
619619
beforeAgent true

‎vars/packageBuildingPipelineDAOS.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ void call(Map pipeline_args) {
536536
}
537537
}
538538
} //stage('Build RPM on EL 9')
539-
stage('Build RPM on Leap 15.4') {
539+
stage('Build RPM on Leap 15.6') {
540540
when {
541541
beforeAgent true
542542
expression { !skipStage() && distros.contains('leap15') }
@@ -556,19 +556,19 @@ void call(Map pipeline_args) {
556556
sh label: 'Build package',
557557
script: '''rm -rf artifacts/leap15/
558558
mkdir -p artifacts/leap15/
559-
make CHROOT_NAME="opensuse-leap-15.4-x86_64" ''' +
559+
make CHROOT_NAME="opensuse-leap-15.6-x86_64" ''' +
560560
'DISTRO_VERSION=' + parseStageInfo()['distro_version'] + ' ' +
561561
pipeline_args.get('make args', '') + ' chrootbuild ' +
562562
pipeline_args.get('add_make_targets', '')
563563
}
564564
post {
565565
success {
566-
rpmlintMockResults('opensuse-leap-15.4-x86_64',
566+
rpmlintMockResults('opensuse-leap-15.6-x86_64',
567567
pipeline_args.get('rpmlint_rpms_allow_errors', false),
568568
pipeline_args.get('rpmlint_rpms_skip', false),
569569
pipeline_args.get('make args', ''))
570570
sh label: 'Collect artifacts',
571-
script: '''(cd /var/lib/mock/opensuse-leap-15.4-x86_64/result/ &&
571+
script: '''(cd /var/lib/mock/opensuse-leap-15.6-x86_64/result/ &&
572572
cp -r . $OLDPWD/artifacts/leap15/)\n''' +
573573
pipeline_args.get('add_archiving_cmds', '').replace('<distro>',
574574
'leap15') +
@@ -585,7 +585,7 @@ void call(Map pipeline_args) {
585585
}
586586
unsuccessful {
587587
sh label: 'Build Log',
588-
script: '''mockroot=/var/lib/mock/opensuse-leap-15.4-x86_64
588+
script: '''mockroot=/var/lib/mock/opensuse-leap-15.6-x86_64
589589
ls -l $mockroot/result/
590590
cat $mockroot/result/{root,build}.log
591591
artdir=$PWD/artifacts/leap15
@@ -595,7 +595,7 @@ void call(Map pipeline_args) {
595595
}
596596
always {
597597
sh label: 'Collect config.log(s)',
598-
script: '(if cd /var/lib/mock/opensuse-leap-15.4-x86_64/root/builddir/build/' +
598+
script: '(if cd /var/lib/mock/opensuse-leap-15.6-x86_64/root/builddir/build/' +
599599
'''BUILD/*/; then
600600
find . -name configure -printf %h\\\\n | \
601601
while read dir; do
@@ -612,7 +612,7 @@ void call(Map pipeline_args) {
612612
archiveArtifacts artifacts: 'artifacts/leap15/**'
613613
}
614614
}
615-
} //stage('Build RPM on Leap 15')
615+
} //stage('Build RPM on Leap 15.6')
616616
stage('Build DEB on Ubuntu 20.04') {
617617
when {
618618
beforeAgent true

‎vars/packageBuildingPipelineDAOSTest.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ void call(Map pipeline_args) {
539539
}
540540
}
541541
} //stage('Build RPM on EL 9')
542-
stage('Build RPM on Leap 15.5') {
542+
stage('Build RPM on Leap 15.6') {
543543
when {
544544
beforeAgent true
545545
expression { !skipStage() && distros.contains('leap15') }
@@ -559,19 +559,19 @@ void call(Map pipeline_args) {
559559
sh label: 'Build package',
560560
script: '''rm -rf artifacts/leap15/
561561
mkdir -p artifacts/leap15/
562-
make CHROOT_NAME="opensuse-leap-15.5-x86_64" ''' +
562+
make CHROOT_NAME="opensuse-leap-15.6-x86_64" ''' +
563563
'DISTRO_VERSION=' + parseStageInfo()['distro_version'] + ' ' +
564564
pipeline_args.get('make args', '') + ' chrootbuild ' +
565565
pipeline_args.get('add_make_targets', '')
566566
}
567567
post {
568568
success {
569-
rpmlintMockResults('opensuse-leap-15.5-x86_64',
569+
rpmlintMockResults('opensuse-leap-15.6-x86_64',
570570
pipeline_args.get('rpmlint_rpms_allow_errors', false),
571571
pipeline_args.get('rpmlint_rpms_skip', false),
572572
pipeline_args.get('make args', ''))
573573
sh label: 'Collect artifacts',
574-
script: '''(cd /var/lib/mock/opensuse-leap-15.5-x86_64/result/ &&
574+
script: '''(cd /var/lib/mock/opensuse-leap-15.6-x86_64/result/ &&
575575
cp -r . $OLDPWD/artifacts/leap15/)\n''' +
576576
pipeline_args.get('add_archiving_cmds', '').replace('<distro>',
577577
'leap15') +
@@ -588,7 +588,7 @@ void call(Map pipeline_args) {
588588
}
589589
unsuccessful {
590590
sh label: 'Build Log',
591-
script: '''mockroot=/var/lib/mock/opensuse-leap-15.5-x86_64
591+
script: '''mockroot=/var/lib/mock/opensuse-leap-15.6-x86_64
592592
ls -l $mockroot/result/
593593
cat $mockroot/result/{root,build}.log
594594
artdir=$PWD/artifacts/leap15
@@ -598,7 +598,7 @@ void call(Map pipeline_args) {
598598
}
599599
always {
600600
sh label: 'Collect config.log(s)',
601-
script: '(if cd /var/lib/mock/opensuse-leap-15.5-x86_64/root/builddir/build/' +
601+
script: '(if cd /var/lib/mock/opensuse-leap-15.6-x86_64/root/builddir/build/' +
602602
'''BUILD/*/; then
603603
find . -name configure -printf %h\\\\n | \
604604
while read dir; do
@@ -615,7 +615,7 @@ void call(Map pipeline_args) {
615615
archiveArtifacts artifacts: 'artifacts/leap15/**'
616616
}
617617
}
618-
} //stage('Build RPM on Leap 15.5')
618+
} //stage('Build RPM on Leap 15.6')
619619
stage('Build DEB on Ubuntu 20.04') {
620620
when {
621621
beforeAgent true

‎vars/parseStageInfo.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ Map call(Map config = [:]) {
103103
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
104104
} else if (stage_name.contains('Leap 15.6')) {
105105
result['target'] = 'leap15'
106-
// Until a mock opensuse-leap-15.6-x86-64.cfg is available provision with 15.5
107-
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5')
106+
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.6')
108107
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
109108
} else if (stage_name.contains('Leap 15')) {
110109
result['target'] = 'leap15'

0 commit comments

Comments
 (0)