From 22d8827991fe1f0f3551e521da7cf8d7a955d095 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Mon, 3 Mar 2025 09:56:52 -0500 Subject: [PATCH 1/6] DAOS-17203 build: Build DAOS RPMs with Leap 15.6 Use the opensuse-leap-15.6-x86_64.cfg mock config to build DAOS RPMs. Skip-func-hw-test: true Skip-func-test-leap15: false Signed-off-by: Phil Henderson --- Jenkinsfile | 1 + ci/parse_ci_envs.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f7cf82739f..7f8f7295010 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 = [:] diff --git a/ci/parse_ci_envs.sh b/ci/parse_ci_envs.sh index 84cb0183f91..7c800b46935 100755 --- a/ci/parse_ci_envs.sh +++ b/ci/parse_ci_envs.sh @@ -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*) From f8e1d55ce068839ab3c8f688cb661d17ffccae9f Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Tue, 4 Mar 2025 14:36:48 -0500 Subject: [PATCH 2/6] Updates. Skip-func-hw-test: true Skip-func-test-leap15: false Signed-off-by: Phil Henderson --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7f8f7295010..0987fd07eb0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -516,7 +516,7 @@ pipeline { } } } - stage('Build RPM on Leap 15.5') { + stage('Build RPM on Leap 15.6') { when { beforeAgent true expression { !skipStage() } @@ -669,7 +669,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() } From 6a84a09228f3627b34db6e337811292444070de1 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Wed, 5 Mar 2025 17:25:46 -0500 Subject: [PATCH 3/6] Attempt to get a newer mock version. Skip-func-hw-test: true Skip-func-test-leap15: false Signed-off-by: Phil Henderson --- utils/rpms/packaging/Dockerfile.mockbuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/rpms/packaging/Dockerfile.mockbuild b/utils/rpms/packaging/Dockerfile.mockbuild index 76a6e941849..39733e298e2 100644 --- a/utils/rpms/packaging/Dockerfile.mockbuild +++ b/utils/rpms/packaging/Dockerfile.mockbuild @@ -1,14 +1,16 @@ # # Copyright 2018-2024 Intel Corporation +# Copyright 2025 Hewlett Packard Enterprise Development LP # # 'recipe' for Docker to build an RPM # # Pull base image -ARG FVERSION=latest -FROM fedora:$FVERSION -# Needed for later use of FVERSION -ARG FVERSION +# ARG FVERSION=latest +# FROM fedora:$FVERSION +# # Needed for later use of FVERSION +# ARG FVERSION +FROM fedora:41 LABEL maintainer="daos@daos.groups.io" # Use local repo server if present From 7bfeaf5e80b61fb0fbdfd8edc2bfbe2b2bac41f2 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Mon, 10 Mar 2025 15:42:04 -0400 Subject: [PATCH 4/6] Pass FVERSION. Skip-func-hw-test: true Skip-func-test-leap15: false Signed-off-by: Phil Henderson --- Jenkinsfile | 2 +- utils/rpms/packaging/Dockerfile.mockbuild | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0987fd07eb0..a1899d41acd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -529,7 +529,7 @@ pipeline { args '--group-add mock' + ' --cap-add=SYS_ADMIN' + ' -v /scratch:/scratch' - additionalBuildArgs dockerBuildArgs() + additionalBuildArgs dockerBuildArgs() + '--build-arg FVERSION=41' } } steps { diff --git a/utils/rpms/packaging/Dockerfile.mockbuild b/utils/rpms/packaging/Dockerfile.mockbuild index 39733e298e2..a09676410db 100644 --- a/utils/rpms/packaging/Dockerfile.mockbuild +++ b/utils/rpms/packaging/Dockerfile.mockbuild @@ -6,12 +6,10 @@ # # Pull base image -# ARG FVERSION=latest -# FROM fedora:$FVERSION -# # Needed for later use of FVERSION -# ARG FVERSION -FROM fedora:41 -LABEL maintainer="daos@daos.groups.io" +ARG FVERSION=latest +FROM fedora:$FVERSION +# Needed for later use of FVERSION +ARG FVERSION # Use local repo server if present ARG REPO_FILE_URL From 59c82dad72642dfb584e34276e2f02b19be73128 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Mon, 10 Mar 2025 15:47:26 -0400 Subject: [PATCH 5/6] Fix unwanted edits Skip-func-hw-test: true Skip-func-test-leap15: false Signed-off-by: Phil Henderson --- utils/rpms/packaging/Dockerfile.mockbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/rpms/packaging/Dockerfile.mockbuild b/utils/rpms/packaging/Dockerfile.mockbuild index a09676410db..76a6e941849 100644 --- a/utils/rpms/packaging/Dockerfile.mockbuild +++ b/utils/rpms/packaging/Dockerfile.mockbuild @@ -1,6 +1,5 @@ # # Copyright 2018-2024 Intel Corporation -# Copyright 2025 Hewlett Packard Enterprise Development LP # # 'recipe' for Docker to build an RPM # @@ -10,6 +9,7 @@ ARG FVERSION=latest FROM fedora:$FVERSION # Needed for later use of FVERSION ARG FVERSION +LABEL maintainer="daos@daos.groups.io" # Use local repo server if present ARG REPO_FILE_URL From cf45b90e5ded0c38aff7f1d1b331aa8b40f0a992 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Mon, 10 Mar 2025 15:57:05 -0400 Subject: [PATCH 6/6] Set leap default to 15.6 too. Skip-func-hw-test: true Skip-func-test-leap15: false Signed-off-by: Phil Henderson --- ci/parse_ci_envs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/parse_ci_envs.sh b/ci/parse_ci_envs.sh index 7c800b46935..332b578239b 100755 --- a/ci/parse_ci_envs.sh +++ b/ci/parse_ci_envs.sh @@ -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}" ;;