Skip to content

Commit 4b067c2

Browse files
phenderphender
authored
DAOS-16500 build: Add support for Leap 15.6 (#450)
Signed-off-by: Phil Henderson <[email protected]>
1 parent e6831a2 commit 4b067c2

File tree

5 files changed

+27
-15
lines changed

5 files changed

+27
-15
lines changed

‎vars/distroVersion.groovy‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ String call(String distro, String branch) {
3535
'2.6': '8.8'],
3636
'el9': ['master': '9.2',
3737
'2.6': '9.2'],
38-
'leap15': ['master': '15.5',
39-
'2.4': '15.5',
40-
'2.6': '15.5'],
38+
'leap15': ['master': '15.6',
39+
'2.4': '15.6',
40+
'2.6': '15.6'],
4141
'ubuntu20': ['master': '20.04']][distro][branch]
4242
}
4343

4444
/* groovylint-disable-next-line CompileStatic */
45-
assert(call('leap15', '2.4') == '15.5')
46-
assert(call('leap15', '2.6') == '15.5')
47-
assert(call('leap15', 'master') == '15.5')
45+
assert(call('leap15', '2.4') == '15.6')
46+
assert(call('leap15', '2.6') == '15.6')
47+
assert(call('leap15', 'master') == '15.6')
4848
assert(call('el8', '2.4') == '8.8')
4949
assert(call('el8', '2.6') == '8.8')
5050
assert(call('el8', 'master') == '8.8')
@@ -76,6 +76,6 @@ String releaseBranch() {
7676
return 'release/2.4'
7777
}
7878
79-
assert(call('leap15') == '15.5')
79+
assert(call('leap15') == '15.6')
8080
assert(call('el8') == '8.8')
8181
*/

‎vars/getChrootName.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// vars/getChrootName.groovy
22

33
/**
4-
* getChrooName.groovy
4+
* getChrootName.groovy
55
*
6-
* getChrooName variable
6+
* getChrootName variable
77
*/
88

99

@@ -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.3-x86_64',
17+
'leap15': 'opensuse-leap-15.5-x86_64',
1818
'ubuntu2004': ''][distro]
1919

2020
}

‎vars/packageBuildingPipelineDAOSTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ void call(Map pipeline_args) {
614614
archiveArtifacts artifacts: 'artifacts/leap15/**'
615615
}
616616
}
617-
} //stage('Build RPM on Leap 15')
617+
} //stage('Build RPM on Leap 15.5')
618618
stage('Build DEB on Ubuntu 20.04') {
619619
when {
620620
beforeAgent true

‎vars/parseStageInfo.groovy‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ Map call(Map config = [:]) {
101101
result['target'] = 'leap15'
102102
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5')
103103
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
104+
} else if (stage_name.contains('Leap 15.6')) {
105+
result['target'] = 'leap15'
106+
result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.6')
107+
new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
104108
} else if (stage_name.contains('Leap 15')) {
105109
result['target'] = 'leap15'
106110
result['distro_version'] = cachedCommitPragma('LEAP15-version',

‎vars/skipStage.groovy‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ boolean call(Map config = [:]) {
213213
case 'Build RPM on Leap 15':
214214
case 'Build RPM on Leap 15.4':
215215
case 'Build RPM on Leap 15.5':
216+
case 'Build RPM on Leap 15.6':
216217
return paramsValue('CI_RPM_leap15_NOBUILD', false) ||
217218
target_branch =~ branchTypeRE('weekly') ||
218219
(docOnlyChange(target_branch) &&
@@ -303,6 +304,7 @@ boolean call(Map config = [:]) {
303304
case 'Build on Leap 15 with Clang':
304305
case 'Build on Leap 15.4 with Clang':
305306
case 'Build on Leap 15.5 with Clang':
307+
case 'Build on Leap 15.6 with Clang':
306308
return paramsValue('CI_BUILD_PACKAGES_ONLY', false) ||
307309
skip_build_on_landing_branch(target_branch) ||
308310
(docOnlyChange(target_branch) &&
@@ -325,6 +327,7 @@ boolean call(Map config = [:]) {
325327
case 'Build on Leap 15':
326328
case 'Build on Leap 15.4':
327329
case 'Build on Leap 15.5':
330+
case 'Build on Leap 15.6':
328331
return paramsValue('CI_BUILD_PACKAGES_ONLY', false) ||
329332
skip_stage_pragma('build-leap15-gcc') ||
330333
(docOnlyChange(target_branch) &&
@@ -333,6 +336,7 @@ boolean call(Map config = [:]) {
333336
case 'Build on Leap 15 with Intel-C and TARGET_PREFIX':
334337
case 'Build on Leap 15.4 with Intel-C and TARGET_PREFIX':
335338
case 'Build on Leap 15.5 with Intel-C and TARGET_PREFIX':
339+
case 'Build on Leap 15.6 with Intel-C and TARGET_PREFIX':
336340
return paramsValue('CI_BUILD_PACKAGES_ONLY', false) ||
337341
target_branch =~ branchTypeRE('weekly') ||
338342
skip_stage_pragma('build-leap15-icc') ||
@@ -422,6 +426,7 @@ boolean call(Map config = [:]) {
422426
case 'Functional on Leap 15':
423427
case 'Functional on Leap 15.4':
424428
case 'Functional on Leap 15.5':
429+
case 'Functional on Leap 15.6':
425430
return skip_ftest('leap15', target_branch, tags)
426431
case 'Functional on Ubuntu 20.04':
427432
/* we don't do any testing on Ubuntu yet
@@ -508,16 +513,18 @@ boolean call(Map config = [:]) {
508513
skip_stage_pragma('test-leap-15-rpms', 'true') ||
509514
stageAlreadyPassed()
510515
case 'Test RPMs on Leap 15.4':
511-
return !paramsValue('CI_RPMS_leap15.4_TEST', true) ||
516+
case 'Test RPMs on Leap 15.5':
517+
case 'Test RPMs on Leap 15.6':
518+
return !paramsValue('CI_RPMS_leap15_TEST', true) ||
512519
target_branch =~ branchTypeRE('weekly') ||
513520
skip_stage_pragma('build-leap15-rpm') ||
514521
skip_stage_pragma('test') ||
515522
skip_stage_pragma('test-rpms') ||
516-
skip_stage_pragma('test-leap-15.4-rpms', 'true') ||
523+
skip_stage_pragma('test-leap-15-rpms', 'true') ||
517524
docOnlyChange(target_branch) ||
518525
(quickFunctional() &&
519-
!paramsValue('CI_RPMS_leap15_4_TEST', true) &&
520-
!run_default_skipped_stage('test-leap-15.4-rpms')) ||
526+
!paramsValue('CI_RPMS_leap15_TEST', true) &&
527+
!run_default_skipped_stage('test-leap-15-rpms')) ||
521528
(rpmTestVersion() != '') ||
522529
stageAlreadyPassed()
523530
case 'Test Packages':
@@ -530,6 +537,7 @@ boolean call(Map config = [:]) {
530537
case 'Scan Leap 15 RPMs':
531538
case 'Scan Leap 15.4 RPMs':
532539
case 'Scan Leap 15.5 RPMs':
540+
case 'Scan Leap 15.6 RPMs':
533541
return skip_scan_rpms('leap15', target_branch)
534542
case 'Test Hardware':
535543
return env.NO_CI_TESTING == 'true' ||

0 commit comments

Comments
 (0)