From ea72dd33616cccab1560b9de08a43778d00ae7ce Mon Sep 17 00:00:00 2001 From: jzarzycki Date: Wed, 13 May 2026 10:22:42 +0000 Subject: [PATCH 1/4] SRE-3435 build: Add SLES 15.7 testing Skip-nlt: true Skip-unit-test: true Skip-unit-test-memcheck: true Skip-func-hw-test: true Signed-off-by: jzarzycki --- Jenkinsfile | 27 ++++++++++++++++++++++++++- ci/parse_ci_envs.sh | 4 ++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f44bd4d2b5..2c862a91208 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,6 +19,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@ryon-jensen/sles15sp7_fix') _ // The trusted-pipeline-lib daosLatestVersion() method will convert this into a number /* groovylint-disable-next-line CompileStatic, VariableName */ @@ -350,7 +351,7 @@ pipeline { defaultValue: true, description: 'Run the Functional on EL 9 test stage') booleanParam(name: 'CI_FUNCTIONAL_leap15_TEST', - defaultValue: false, + defaultValue: true, description: 'Run the Functional on Leap 15 test stage') booleanParam(name: 'CI_FUNCTIONAL_ubuntu20_TEST', defaultValue: false, @@ -938,6 +939,30 @@ pipeline { } } // post } // stage('Functional on Leap 15') + stage('Functional on SLES 15') { + when { + beforeAgent true + expression { !skipStage() } + } + agent { + label vm9_label('Leap15') + } + steps { + job_step_update( + functionalTest( + inst_repos: daosRepos(), + inst_rpms: functionalPackages(1, next_version(), 'tests-internal') + + ' mercury-libfabric', + test_function: 'runTestFunctionalV2', + image_version: 'sles15.7')) + } + post { + always { + functionalTestPostV2() + job_status_update() + } + } // post + } // stage('Functional on SLES 15') stage('Functional on Ubuntu 20.04') { when { beforeAgent true diff --git a/ci/parse_ci_envs.sh b/ci/parse_ci_envs.sh index 84cb0183f91..835e88fdcd5 100755 --- a/ci/parse_ci_envs.sh +++ b/ci/parse_ci_envs.sh @@ -22,6 +22,10 @@ if [ -n "${STAGE_NAME:?}" ]; then : "${TARGET:=centos9}" : "${REPO_SPEC:=el-9}" ;; + *SLES\ 15.7*|*sles15.7*) + : "${CHROOT_NAME:=sles-15-sp7-x86_64}" + : "${TARGET:=sles15.7}" + ;; *Leap\ 15.6*|*leap15.6*|*opensuse15.6*|*sles15.6*) : "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}" : "${TARGET:=leap15.6}" From e70cc613502e408da4020348f934bb248d37ab79 Mon Sep 17 00:00:00 2001 From: jzarzycki Date: Thu, 14 May 2026 12:41:53 +0000 Subject: [PATCH 2/4] revert pipeline-lib branch to master Doc-only: true Signed-off-by: jzarzycki --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c862a91208..5226923fba4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,6 @@ // 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@ryon-jensen/sles15sp7_fix') _ // The trusted-pipeline-lib daosLatestVersion() method will convert this into a number /* groovylint-disable-next-line CompileStatic, VariableName */ From f84c8de67489df14a6939c48be7918c5633a90a7 Mon Sep 17 00:00:00 2001 From: Jan Zarzycki Date: Thu, 28 May 2026 14:34:37 +0200 Subject: [PATCH 3/4] apply review suggestion to indent code Co-authored-by: Tomasz Gromadzki Signed-off-by: Jan Zarzycki --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5226923fba4..f6177b056b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -951,7 +951,7 @@ pipeline { functionalTest( inst_repos: daosRepos(), inst_rpms: functionalPackages(1, next_version(), 'tests-internal') + - ' mercury-libfabric', + ' mercury-libfabric', test_function: 'runTestFunctionalV2', image_version: 'sles15.7')) } From ec814c50e85fc1a19c9b868c90a236a48a050958 Mon Sep 17 00:00:00 2001 From: jzarzycki Date: Thu, 28 May 2026 12:43:54 +0000 Subject: [PATCH 4/4] apply review suggestions Signed-off-by: jzarzycki --- Jenkinsfile | 3 +-- ci/parse_ci_envs.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6177b056b3..9ec1b4c39e0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,6 @@ // 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') _ - // The trusted-pipeline-lib daosLatestVersion() method will convert this into a number /* groovylint-disable-next-line CompileStatic, VariableName */ String next_version() { @@ -350,7 +349,7 @@ pipeline { defaultValue: true, description: 'Run the Functional on EL 9 test stage') booleanParam(name: 'CI_FUNCTIONAL_leap15_TEST', - defaultValue: true, + defaultValue: false, description: 'Run the Functional on Leap 15 test stage') booleanParam(name: 'CI_FUNCTIONAL_ubuntu20_TEST', defaultValue: false, diff --git a/ci/parse_ci_envs.sh b/ci/parse_ci_envs.sh index 835e88fdcd5..2d15d81b470 100755 --- a/ci/parse_ci_envs.sh +++ b/ci/parse_ci_envs.sh @@ -27,7 +27,7 @@ if [ -n "${STAGE_NAME:?}" ]; then : "${TARGET:=sles15.7}" ;; *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*)