Skip to content

DAOS-17203 build: Build DAOS RPMs with Leap 15.6 #16648

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.

Sign up for GitHub

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

Draft
phender wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

DAOS-17203 build: Build DAOS RPMs with Leap 15.6 #16648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5694cf5
DAOS-17203 build: Build DAOS RPMs with Leap 15.6
phender Jul 23, 2025
77e6407
Merge branch 'master' into hendersp/DAOS-17302_2
phender Jul 24, 2025
c3f85cb
Ensure we have lua-lmod > 8.7.34.
phender Jul 24, 2025
75eb214
Attempt 2.
phender Jul 25, 2025
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
36 changes: 21 additions & 15 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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 @@ -558,7 +559,7 @@ pipeline {
}
}
}
stage('Build RPM on Leap 15.5') {
stage('Build RPM on Leap 15.6') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -571,8 +572,7 @@ pipeline {
' --cap-add=SYS_ADMIN' +
' --privileged=true' +
' -v /scratch:/scratch'
additionalBuildArgs dockerBuildArgs() +
'--build-arg FVERSION=37'
additionalBuildArgs dockerBuildArgs()
}
}
steps {
Expand Down Expand Up @@ -712,10 +712,10 @@ pipeline {
}
}
}
stage('Build on Leap 15.5') {
stage('Build on Leap 15.6') {
when {
beforeAgent true
expression { !params.CI_leap15_NOBUILD && !skipStage() }
expression { !params.CI_leap15_NOBUILD && !skipStage() }
}
agent {
dockerfile {
Expand All @@ -724,15 +724,18 @@ pipeline {
additionalBuildArgs dockerBuildArgs(repo_type: 'stable',
parallel_build: true,
deps_build: true) +
" -t ${sanitized_JOB_NAME()}-leap15-gcc"
" -t ${sanitized_JOB_NAME()}-leap15-gcc" +
' --build-arg REPOS="' + prRepos() + '"'
}
}
steps {
job_step_update(
sconsBuild(parallel_build: true,
scons_args: sconsFaultsArgs() +
' PREFIX=/opt/daos TARGET_TYPE=release',
build_deps: 'yes'))
stash_files: 'ci/test_files_to_stash.txt',
build_deps: 'no',
stash_opt: true,
scons_args: sconsArgs() +
' PREFIX=/opt/daos TARGET_TYPE=release'))
}
post {
unsuccessful {
Expand All @@ -747,10 +750,10 @@ 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() }
expression { !params.CI_leap15_NOBUILD && !skipStage() }
}
agent {
dockerfile {
Expand All @@ -759,16 +762,19 @@ pipeline {
additionalBuildArgs dockerBuildArgs(repo_type: 'stable',
parallel_build: true,
deps_build: true) +
" -t ${sanitized_JOB_NAME()}-leap15" +
" -t ${sanitized_JOB_NAME()}-leap15-intelc" +
' --build-arg REPOS="' + prRepos() + '"' +
' --build-arg COMPILER=icc'
}
}
steps {
job_step_update(
sconsBuild(parallel_build: true,
scons_args: sconsFaultsArgs() +
' PREFIX=/opt/daos TARGET_TYPE=release',
build_deps: 'no'))
stash_files: 'ci/test_files_to_stash.txt',
build_deps: 'no',
stash_opt: true,
scons_args: sconsArgs() +
' PREFIX=/opt/daos TARGET_TYPE=release'))
}
post {
unsuccessful {
Expand Down
4 changes: 2 additions & 2 deletions ci/parse_ci_envs.sh
View file
Open in desktop
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
5 changes: 5 additions & 0 deletions utils/scripts/install-leap15.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@
which \
yasm

# Make sure we have lua-lmod > 8.7.34
dnf remove lua-lmod
dnf --nodocs --nogpgcheck install ${dnf_install_args} \

Check failure on line 80 in utils/scripts/install-leap15.sh

View workflow job for this annotation

GitHub Actions / ShellCheck 

Double quote to prevent globbing and word splitting. [SC2086]
lua-lmod --repo='*-oss*' --repo '*lua*' --repo '*network-cluster*'

# shellcheck disable=SC2086
dnf install ${dnf_install_args} ruby-devel
gem install json -v 2.7.6
Expand Down
Loading