From 9ee33d70025dfb1ca08982d4a31c2133dcb8bf20 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 15 Dec 2025 20:57:47 +0100 Subject: [PATCH 1/4] SRE-3458 build: Use explicit minor version number for build (el 9.6, leap 15.5) (#17152) Use explicit version number for build (el 9.6 and leap 15.5) OS version can be fully controlled now from Jenkins file. It is not longer decided by the docker host configuration. Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 53f34c8a148..8cdcf6e3ca6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -677,7 +677,9 @@ pipeline { deps_build: true, parallel_build: true) + " -t ${sanitized_JOB_NAME()}-el9 " + - ' --build-arg REPOS="' + prRepos() + '"' + ' --build-arg REPOS="' + prRepos() + '"' + + ' --build-arg POINT_RELEASE=.2 ' + } } steps { @@ -714,7 +716,9 @@ 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 POINT_RELEASE=.6 ' + } } steps { @@ -750,7 +754,9 @@ pipeline { parallel_build: true, deps_build: true) + " -t ${sanitized_JOB_NAME()}-leap15" + - ' --build-arg COMPILER=icc' + ' --build-arg COMPILER=icc' + + ' --build-arg POINT_RELEASE=.6 ' + } } steps { From 85ea83024f7e427bb98cd6cfe32a9ca851c3db10 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 19 Dec 2025 20:14:31 +0100 Subject: [PATCH 2/4] Fix el9.2 -> el9.6 Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8cdcf6e3ca6..26326c4711c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -664,7 +664,7 @@ pipeline { } } } - stage('Build on EL 9') { + stage('Build on EL 9.6') { when { beforeAgent true expression { !params.CI_el9_NOBUILD && !skipStage() } @@ -678,7 +678,7 @@ pipeline { parallel_build: true) + " -t ${sanitized_JOB_NAME()}-el9 " + ' --build-arg REPOS="' + prRepos() + '"' + - ' --build-arg POINT_RELEASE=.2 ' + ' --build-arg POINT_RELEASE=.6 ' } } @@ -704,7 +704,7 @@ pipeline { } } } - stage('Build on Leap 15.5') { + stage('Build on Leap 15.6') { when { beforeAgent true expression { !params.CI_leap15_NOBUILD && !skipStage() } @@ -741,7 +741,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() } From a6185954b91958c39f6cdf183ce1fccabf67af3d Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 31 Dec 2025 09:58:53 +0100 Subject: [PATCH 3/4] Revert Intel build to leap 15.5 Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 26326c4711c..545823f5f79 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -741,7 +741,7 @@ pipeline { } } } - stage('Build on Leap 15.6 with Intel-C and TARGET_PREFIX') { + stage('Build on Leap 15.5 with Intel-C and TARGET_PREFIX') { when { beforeAgent true expression { !params.CI_leap15_NOBUILD && !skipStage() } @@ -755,7 +755,7 @@ pipeline { deps_build: true) + " -t ${sanitized_JOB_NAME()}-leap15" + ' --build-arg COMPILER=icc' + - ' --build-arg POINT_RELEASE=.6 ' + ' --build-arg POINT_RELEASE=.5 ' } } From c480868a647ecdd152a31a8b66dc4e8c90ca0f19 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 12 Jan 2026 09:41:45 +0100 Subject: [PATCH 4/4] Do not change versions for 2.6 builds Signed-off-by: Tomasz Gromadzki --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 545823f5f79..2630a93d758 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ /* groovylint-disable DuplicateMapLiteral, DuplicateNumberLiteral */ /* groovylint-disable DuplicateStringLiteral, NestedBlockDepth, VariableName */ /* Copyright 2019-2024 Intel Corporation - * Copyright 2025 Hewlett Packard Enterprise Development LP + * Copyright 2025-2026 Hewlett Packard Enterprise Development LP * All rights reserved. * * This file is part of the DAOS Project. It is subject to the license terms @@ -704,7 +704,7 @@ pipeline { } } } - stage('Build on Leap 15.6') { + stage('Build on Leap 15.5') { when { beforeAgent true expression { !params.CI_leap15_NOBUILD && !skipStage() } @@ -717,7 +717,7 @@ pipeline { parallel_build: true, deps_build: true) + " -t ${sanitized_JOB_NAME()}-leap15-gcc" + - ' --build-arg POINT_RELEASE=.6 ' + ' --build-arg POINT_RELEASE=.5 ' } }