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.

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: Move to Leap 15.6 #15561

Merged
merged 9 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
21 changes: 11 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,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@pahender/DAOS-16500') _
phender marked this conversation as resolved.
Show resolved Hide resolved

/* groovylint-disable-next-line CompileStatic */
job_status_internal = [:]
Expand Down Expand Up @@ -533,7 +534,7 @@ pipeline {
}
}
}
stage('Build RPM on Leap 15.5') {
stage('Build RPM on Leap 15.6') {
phender marked this conversation as resolved.
Show resolved Hide resolved
when {
beforeAgent true
expression { !skipStage() }
Expand Down Expand Up @@ -686,7 +687,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 { !skipStage() }
Expand Down Expand Up @@ -965,7 +966,7 @@ pipeline {
}
}
} // stage('Functional on EL 9')
stage('Functional on Leap 15.5') {
stage('Functional on Leap 15.6') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -986,7 +987,7 @@ pipeline {
job_status_update()
}
} // post
} // stage('Functional on Leap 15.5')
} // stage('Functional on Leap 15.6')
stage('Functional on Ubuntu 20.04') {
when {
beforeAgent true
Expand Down Expand Up @@ -1061,7 +1062,7 @@ pipeline {
job_status_update()
}
}
} // stage('Fault inection testing on EL 8.8')
} // stage('Fault injection testing on EL 8.8')
stage('Test RPMs on EL 8.6') {
when {
beforeAgent true
Expand All @@ -1081,8 +1082,8 @@ pipeline {
rpm_test_post(env.STAGE_NAME, env.NODELIST)
}
}
} // stage('Test CentOS 7 RPMs')
stage('Test RPMs on Leap 15.4') {
} // stage('Test RPMs on EL 8.6')
stage('Test RPMs on Leap 15.6') {
phender marked this conversation as resolved.
Show resolved Hide resolved
when {
beforeAgent true
expression { ! skipStage() }
Expand All @@ -1096,8 +1097,8 @@ pipeline {
* additionally for this use-case, can't override
ftest_arg with this :-(
script {
'Test RPMs on Leap 15.4': getFunctionalTestStage(
name: 'Test RPMs on Leap 15.4',
'Test RPMs on Leap 15.6': getFunctionalTestStage(
name: 'Test RPMs on Leap 15.6',
pragma_suffix: '',
label: params.CI_UNIT_VM1_LABEL,
next_version: next_version,
Expand Down Expand Up @@ -1133,7 +1134,7 @@ pipeline {
rpm_test_post(env.STAGE_NAME, env.NODELIST)
}
}
} // stage('Test Leap 15 RPMs')
} // stage('Test RPMs on Leap 15.6')
} // parallel
} // stage('Test')
stage('Test Storage Prep on EL 8.8') {
Expand Down
4 changes: 4 additions & 0 deletions ci/parse_ci_envs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ if [ -n "${STAGE_NAME:?}" ]; then
: "${TARGET:=centos9}"
: "${REPO_SPEC:=el-9}"
;;
*Leap\ 15.6*|*leap15.6*|*opensuse15.6*|*sles15.6*)
: "${CHROOT_NAME:=opensuse-leap-15.6-x86_64}"
phender marked this conversation as resolved.
Show resolved Hide resolved
: "${TARGET:=leap15.6}"
;;
*Leap\ 15.5*|*leap15.5*|*opensuse15.5*|*sles15.5*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${TARGET:=leap15.5}"
Expand Down
8 changes: 8 additions & 0 deletions utils/rpms/packaging/Makefile_distro_vars.mk
phender marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ DISTRO_VERSION ?= $(VERSION_ID)
ORIG_TARGET_VER := 15.5
SED_EXPR := 1p
endif
ifeq ($(CHROOT_NAME),opensuse-leap-15.6-x86_64)
VERSION_ID := 15.6
DISTRO_ID := sl15.6
DISTRO_BASE := LEAP_15
DISTRO_VERSION ?= $(VERSION_ID)
ORIG_TARGET_VER := 15.6
SED_EXPR := 1p
endif
endif
ifeq ($(ID),centos)
ID = el
Expand Down
2 changes: 1 addition & 1 deletion utils/scripts/helpers/repo-helper-leap15.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -uex
# for custom packages if present.

: "${REPO_FILE_URL:=}"
: "${BASE_DISTRO:=opensuse/leap:15.5}"
: "${BASE_DISTRO:=opensuse/leap:15.6}"
: "${JENKINS_URL:=}"
: "${REPOS:=}"

Expand Down
Loading