Skip to content

Commit 2ff1d21

Browse files
authored
SRE-3458 build: Use explicit minor version number for build (el 9.6, leap 15.5) (#17152)
Use explicit version number for build (el 9.6 and leap 15.5) OS version can be fully controlled now from Jenkins file. It is not longer decided by the docker host configuration. Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
1 parent fce9975 commit 2ff1d21

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

Jenkinsfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ pipeline {
574574
}
575575
}
576576
}
577-
stage('Build on EL 9') {
577+
stage('Build on EL 9.6') {
578578
when {
579579
beforeAgent true
580580
expression { !skip_build_stage('el9') }
@@ -589,7 +589,9 @@ pipeline {
589589
" -t ${sanitized_JOB_NAME()}-el9 " +
590590
' --build-arg DAOS_PACKAGES_BUILD=no ' +
591591
' --build-arg DAOS_KEEP_SRC=yes ' +
592-
' --build-arg REPOS="' + prRepos() + '"'
592+
' --build-arg REPOS="' + prRepos() + '"' +
593+
' --build-arg POINT_RELEASE=.6 '
594+
593595
}
594596
}
595597
steps {
@@ -640,7 +642,9 @@ pipeline {
640642
deps_build: false) +
641643
' --build-arg DAOS_PACKAGES_BUILD=no ' +
642644
' --build-arg DAOS_KEEP_SRC=yes ' +
643-
" -t ${sanitized_JOB_NAME()}-leap15-gcc"
645+
" -t ${sanitized_JOB_NAME()}-leap15" +
646+
' --build-arg POINT_RELEASE=.5 '
647+
644648
}
645649
}
646650
steps {
@@ -687,9 +691,11 @@ pipeline {
687691
additionalBuildArgs dockerBuildArgs(repo_type: 'stable',
688692
parallel_build: true,
689693
deps_build: true) +
690-
" -t ${sanitized_JOB_NAME()}-leap15" +
694+
" -t ${sanitized_JOB_NAME()}-leap15-icc" +
691695
' --build-arg DAOS_PACKAGES_BUILD=no ' +
692-
' --build-arg COMPILER=icc'
696+
' --build-arg COMPILER=icc' +
697+
' --build-arg POINT_RELEASE=.5 '
698+
693699
}
694700
}
695701
steps {

0 commit comments

Comments
 (0)