Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// To use a test branch (i.e. PR) until it lands to master
// I.e. for testing library changes
//@Library(value='pipeline-lib@your_branch') _
@Library(value='pipeline-lib@hendersp/DAOS-17203') _

/* groovylint-disable-next-line CompileStatic */
job_status_internal = [:]
Expand Down Expand Up @@ -552,7 +553,7 @@ pipeline {
}
}
}
stage('Build RPM on Leap 15.5') {
stage('Build RPM on Leap 15.6') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -565,8 +566,7 @@ pipeline {
' --cap-add=SYS_ADMIN' +
' --privileged=true' +
' -v /scratch:/scratch'
additionalBuildArgs dockerBuildArgs() +
'--build-arg FVERSION=37'
additionalBuildArgs dockerBuildArgs()
}
}
steps {
Expand Down Expand Up @@ -668,7 +668,7 @@ pipeline {
}
}
}
stage('Build on Leap 15.5 with Intel-C and TARGET_PREFIX') {
stage('Build on Leap 15.6 with Intel-C and TARGET_PREFIX') {
when {
beforeAgent true
expression { !params.CI_leap15_NOBUILD && !skipStage() }
Expand Down
4 changes: 2 additions & 2 deletions ci/parse_ci_envs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -n "${STAGE_NAME:?}" ]; then
: "${REPO_SPEC:=el-9}"
;;
*Leap\ 15.6*|*leap15.6*|*opensuse15.6*|*sles15.6*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${CHROOT_NAME:=opensuse-leap-15.6-x86_64}"
: "${TARGET:=leap15.6}"
;;
*Leap\ 15.5*|*leap15.5*|*opensuse15.5*|*sles15.5*)
Expand All @@ -39,7 +39,7 @@ if [ -n "${STAGE_NAME:?}" ]; then
: "${TARGET:=leap15.3}"
;;
*Leap\ 15*|*leap15*|*opensuse15*|*sles15*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${CHROOT_NAME:=opensuse-leap-15.6-x86_64}"
: "${TARGET:=leap15}"
: "${REPO_SPEC:=sl-15}"
;;
Expand Down
Loading