From 10e01b2925ffe3589b244b7ad319e11b01e39056 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 12 Jan 2026 22:35:55 +0100 Subject: [PATCH 01/12] SRE-3522 ci: update to el9.7 Cancel-prev-build: false Priority: 2 Signed-off-by: Tomasz Gromadzki --- vars/distroVersion.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index 8f66f9600..96fc9b708 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -33,8 +33,8 @@ String call(String distro, String branch) { return ['el8': ['master': '8.8', '2.4': '8.8', '2.6': '8.8'], - 'el9': ['master': '9.4', - '2.6': '9.4'], + 'el9': ['master': '9.7', + '2.6': '9.7'], 'leap15': ['master': '15.6', '2.4': '15.6', '2.6': '15.6'], @@ -48,8 +48,8 @@ assert(call('leap15', 'master') == '15.6') assert(call('el8', '2.4') == '8.8') assert(call('el8', '2.6') == '8.8') assert(call('el8', 'master') == '8.8') -assert(call('el9', 'master') == '9.4') -assert(call('el9', '2.6') == '9.4') +assert(call('el9', 'master') == '9.7') +assert(call('el9', '2.6') == '9.7') /* Uncomment to do further testing env = [:] From 176f5bc490a70f60b52b9cdcd46398f6d3895058 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 14 Jan 2026 14:40:27 +0100 Subject: [PATCH 02/12] Do not change release/2.6 settings Priority: 2 Signed-off-by: Tomasz Gromadzki --- vars/distroVersion.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index 96fc9b708..c405c4f4d 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -34,7 +34,7 @@ String call(String distro, String branch) { '2.4': '8.8', '2.6': '8.8'], 'el9': ['master': '9.7', - '2.6': '9.7'], + '2.6': '9.4'], 'leap15': ['master': '15.6', '2.4': '15.6', '2.6': '15.6'], @@ -49,7 +49,7 @@ assert(call('el8', '2.4') == '8.8') assert(call('el8', '2.6') == '8.8') assert(call('el8', 'master') == '8.8') assert(call('el9', 'master') == '9.7') -assert(call('el9', '2.6') == '9.7') +assert(call('el9', '2.6') == '9.4') /* Uncomment to do further testing env = [:] From 401066c6c19112199e776c9cb185b0f16b312bfb Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 15 Jan 2026 16:26:49 +0100 Subject: [PATCH 03/12] Fix el9 missing issue Signed-off-by: Tomasz Gromadzki --- ci/provisioning/post_provision_config.sh | 2 +- vars/provisionNodes.groovy | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/provisioning/post_provision_config.sh b/ci/provisioning/post_provision_config.sh index 6883999b3..9b910c9fa 100755 --- a/ci/provisioning/post_provision_config.sh +++ b/ci/provisioning/post_provision_config.sh @@ -19,7 +19,7 @@ source ci/provisioning/post_provision_config_common_functions.sh # shellcheck disable=SC1091 source ci/junit.sh -: "${DISTRO:=EL_7}" +: "${DISTRO:=EL_9}" DSL_REPO_var="DAOS_STACK_${DISTRO}_LOCAL_REPO" DSG_REPO_var="DAOS_STACK_${DISTRO}_GROUP_REPO" DSA_REPO_var="DAOS_STACK_${DISTRO}_APPSTREAM_REPO" diff --git a/vars/provisionNodes.groovy b/vars/provisionNodes.groovy index 5ec50533c..93a853a17 100644 --- a/vars/provisionNodes.groovy +++ b/vars/provisionNodes.groovy @@ -142,9 +142,11 @@ Map call(Map config = [:]) { provision_script += 'EL_7' break case 'el8': - case 'el9': provision_script += 'EL_8' break + case 'el9': + provision_script += 'EL_9' + break case 'suse': provision_script += 'LEAP_15' break From 4d2bb37c5ab2873efdaa10b5e6d5bd99ad648f05 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 16 Jan 2026 14:03:30 +0100 Subject: [PATCH 04/12] Add missing skip case for Functional tests Signed-off-by: Tomasz Gromadzki --- vars/skipStage.groovy | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/vars/skipStage.groovy b/vars/skipStage.groovy index d0687d704..c701b1e0e 100644 --- a/vars/skipStage.groovy +++ b/vars/skipStage.groovy @@ -417,11 +417,15 @@ boolean call(Map config = [:]) { case 'Functional on EL 8 with Valgrind': case 'Functional on EL 8.8 with Valgrind': return skip_ftest_valgrind('el8', target_branch, tags) + case 'Functional on EL 9 with Valgrind': + case 'Functional on EL 9.7 with Valgrind': + return skip_ftest_valgrind('el7', target_branch, tags) case 'Functional on CentOS 8': case 'Functional on EL 8': case 'Functional on EL 8.8': return skip_ftest('el8', target_branch, tags) case 'Functional on EL 9': + case 'Functional on EL 9.7': return skip_ftest('el9', target_branch, tags) case 'Functional on Leap 15': case 'Functional on Leap 15.4': @@ -436,6 +440,7 @@ boolean call(Map config = [:]) { case 'Fault injection testing on CentOS 8': case 'Fault injection testing on EL 8': case 'Fault injection testing on EL 8.8': + case 'Fault injection testing on EL 9.7': return skip_stage_pragma('fault-injection-test') || !paramsValue('CI_FI_el8_TEST', true) || quickFunctional() || @@ -518,6 +523,19 @@ boolean call(Map config = [:]) { !run_default_skipped_stage('test-el-8.8-rpms')) || (rpmTestVersion() != '') || stageAlreadyPassed() + case 'Test RPMs on EL 9.7': + return !paramsValue('CI_RPMS_el9.7_TEST', true) || + target_branch =~ branchTypeRE('weekly') || + skip_stage_pragma('build-el9-rpm') || + skip_stage_pragma('test') || + skip_stage_pragma('test-rpms') || + skip_stage_pragma('test-el-9.7-rpms') || + docOnlyChange(target_branch) || + (quickFunctional() && + !paramsValue('CI_RPMS_el9_7_TEST', true) && + !run_default_skipped_stage('test-el-9.7-rpms')) || + (rpmTestVersion() != '') || + stageAlreadyPassed() case 'Test Leap 15 RPMs': case 'Test Leap 15.2 RPMs': // Skip by default as it doesn't pass with Leap15.3 due to From 9253da620271d45a85fa7b9b9cb3a07801eaf80e Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 16 Jan 2026 14:21:09 +0100 Subject: [PATCH 05/12] Extend skipStage logic to cover all EL9.7 cases - add all possible cases for el9.7 and el9 related stages to skip logic - ignore CI_BUILD_PACKAGES_ONLY for regular builds as they are now used for RPM building Signed-off-by: Tomasz Gromadzki --- vars/skipStage.groovy | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/vars/skipStage.groovy b/vars/skipStage.groovy index c701b1e0e..bdd116f04 100644 --- a/vars/skipStage.groovy +++ b/vars/skipStage.groovy @@ -134,8 +134,7 @@ boolean skip_if_unstable() { } boolean skip_build_on_el_gcc(String target_branch, String version) { - return paramsValue('CI_BUILD_PACKAGES_ONLY', false) || - skip_stage_pragma('build-el' + version + '-gcc') || + return skip_stage_pragma('build-el' + version + '-gcc') || (docOnlyChange(target_branch) && prRepos('el' + version) == '') || quickFunctional() @@ -229,9 +228,6 @@ boolean call(Map config = [:]) { prReposContains('ubuntu20', jobName()) || skip_stage_pragma('build-ubuntu20-rpm') case 'Build on CentOS 8': - case 'Build on EL 8': - case 'Build on EL 8.8': - return skip_build_on_el_gcc(target_branch, '8') case 'Build on CentOS 7 Bullseye': return skip_build_bullseye(target_branch, 'centos7') case 'Build on CentOS 8 Bullseye': @@ -312,11 +308,17 @@ boolean call(Map config = [:]) { /* groovylint-disable-next-line DuplicateCaseStatement */ case 'Build on CentOS 8': case 'Build on EL 8': - return paramsValue('CI_BUILD_PACKAGES_ONLY', false) || - skip_stage_pragma('build-el8-gcc-dev') || + case 'Build on EL 8.8': + return skip_build_on_el_gcc(target_branch, '8') || (docOnlyChange(target_branch) && prRepos('el8') == '') || quickBuild() + case 'Build on EL 9': + case 'Build on EL 9.7': + return skip_build_on_el_gcc(target_branch, '9') || + (docOnlyChange(target_branch) && + prRepos('el9') == '') || + quickBuild() case 'Build on Ubuntu 20.04 with Clang': return paramsValue('CI_BUILD_PACKAGES_ONLY', false) || target_branch =~ branchTypeRE('weekly') || @@ -328,8 +330,7 @@ boolean call(Map config = [:]) { case 'Build on Leap 15.4': case 'Build on Leap 15.5': case 'Build on Leap 15.6': - return paramsValue('CI_BUILD_PACKAGES_ONLY', false) || - skip_stage_pragma('build-leap15-gcc') || + return skip_stage_pragma('build-leap15-gcc') || (docOnlyChange(target_branch) && prRepos('leap15') == '') || quickBuild() @@ -355,6 +356,8 @@ boolean call(Map config = [:]) { case 'NLT on CentOS 8': case 'NLT on EL 8': case 'NLT on EL 8.8': + case 'NLT on EL 9': + case 'NLT on EL 9.7': return skip_stage_pragma('nlt') || quickBuild() || stageAlreadyPassed() @@ -369,6 +372,10 @@ boolean call(Map config = [:]) { case 'Unit Test with memcheck on CentOS 8': case 'Unit Test with memcheck on EL 8': case 'Unit Test with memcheck on EL 8.8': + case 'Unit Test with memcheck on EL 9': + case 'Unit Test with memcheck on EL 9.7': + case 'Unit Test bdev with memcheck on EL 9': + case 'Unit Test bdev with memcheck on EL 9.7': case 'Unit Test with memcheck': return !paramsValue('CI_UNIT_TEST_MEMCHECK', true) || skip_stage_pragma('unit-test-memcheck') || @@ -379,6 +386,10 @@ boolean call(Map config = [:]) { case 'Unit Test on EL 8.8': case 'Unit Test bdev on EL 8': case 'Unit Test bdev on EL 8.8': + case 'Unit Test on EL 9': + case 'Unit Test on EL 9.7': + case 'Unit Test bdev on EL 9': + case 'Unit Test bdev on EL 9.7': return !paramsValue('CI_UNIT_TEST', true) || skip_stage_pragma('unit-test') || skip_stage_pragma('run_test') || @@ -419,7 +430,7 @@ boolean call(Map config = [:]) { return skip_ftest_valgrind('el8', target_branch, tags) case 'Functional on EL 9 with Valgrind': case 'Functional on EL 9.7 with Valgrind': - return skip_ftest_valgrind('el7', target_branch, tags) + return skip_ftest_valgrind('el9', target_branch, tags) case 'Functional on CentOS 8': case 'Functional on EL 8': case 'Functional on EL 8.8': @@ -440,7 +451,6 @@ boolean call(Map config = [:]) { case 'Fault injection testing on CentOS 8': case 'Fault injection testing on EL 8': case 'Fault injection testing on EL 8.8': - case 'Fault injection testing on EL 9.7': return skip_stage_pragma('fault-injection-test') || !paramsValue('CI_FI_el8_TEST', true) || quickFunctional() || @@ -448,6 +458,15 @@ boolean call(Map config = [:]) { skip_stage_pragma('func-test') || skip_stage_pragma('func-test-vm') || stageAlreadyPassed() + case 'Fault injection testing on EL 9': + case 'Fault injection testing on EL 9.7': + return skip_stage_pragma('fault-injection-test') || + !paramsValue('CI_FI_el9_TEST', true) || + quickFunctional() || + docOnlyChange(target_branch) || + skip_stage_pragma('func-test') || + skip_stage_pragma('func-test-vm') || + stageAlreadyPassed() case 'Test CentOS 7 RPMs': return !paramsValue('CI_RPMS_el7_TEST', true) || target_branch =~ branchTypeRE('weekly') || From 6baf46af56f5a03d115f6399e14569e9c0feff19 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 19 Jan 2026 14:34:57 +0100 Subject: [PATCH 06/12] Upgrade default el7 to el9 Signed-off-by: Tomasz Gromadzki --- vars/prRepos.groovy | 4 +++- vars/provisionNodesV1.groovy | 6 +++--- vars/quickBuildDeps.groovy | 5 +++++ vars/skipStage.groovy | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/vars/prRepos.groovy b/vars/prRepos.groovy index 30c9ad4eb..9da41ef0d 100644 --- a/vars/prRepos.groovy +++ b/vars/prRepos.groovy @@ -25,7 +25,9 @@ String call(String distro=null) { _distro.startsWith('rocky8') || _distro.startsWith('almalinux8') || _distro.startsWith('rhel8')) { repos = cachedCommitPragma('PR-repos-el8') - } else if (_distro.startsWith('el9')) { + } else if (_distro.startsWith('el9') || + _distro.startsWith('rocky9') || _distro.startsWith('almalinux9') || + _distro.startsWith('rhel9')) { repos = cachedCommitPragma('PR-repos-el9') } else if (_distro.startsWith('leap15')) { repos = cachedCommitPragma('PR-repos-leap15') diff --git a/vars/provisionNodesV1.groovy b/vars/provisionNodesV1.groovy index d496e3f15..9a8e8988c 100644 --- a/vars/provisionNodesV1.groovy +++ b/vars/provisionNodesV1.groovy @@ -13,7 +13,7 @@ * @param config Map of parameters passed. * * config['arch'] Architecture to use. Default 'x86_64' - * config['distro'] Distribution to use. Default 'el7' + * config['distro'] Distribution to use. Default 'el9' * config['NODELIST'] Comma separated list of nodes available. * config['node_count'] Optional lower number of nodes to provision. * config['profile'] Profile to use. Default 'daos_ci'. @@ -76,7 +76,7 @@ def call(Map config = [:]) { } def distro_type = 'el' - def distro = config.get('distro', 'el7') + def distro = config.get('distro', 'el9') if (distro == 'centos7') { distro = 'el7' } else if (distro.startsWith("sles") || distro.startsWith("leap") || @@ -200,7 +200,7 @@ EOF''' branch=\\"\\\${branch%:*}\\" fi fi''' - if (distro.startsWith("el7")) { + if (distro.startsWith("el")) { if (config['power_only']) { // Since we don't have CORCI-711 yet, erase things we know could have // been put on the node previously diff --git a/vars/quickBuildDeps.groovy b/vars/quickBuildDeps.groovy index ab2a6c565..a6f1f01de 100755 --- a/vars/quickBuildDeps.groovy +++ b/vars/quickBuildDeps.groovy @@ -29,6 +29,11 @@ def call(String distro, always=false) { distro.startsWith('rhel8')) { rpmspec_args = "--undefine suse_version " + "--define rhel\\ 8" + } else if (distro.startsWith('el9') || + distro.startsWith('rocky9') || distro.startsWith('almalinux9') || + distro.startsWith('rhel9')) { + rpmspec_args = "--undefine suse_version " + + "--define rhel\\ 9" } else { error("Unknown distro: ${distro} in quickBuildDeps()") } diff --git a/vars/skipStage.groovy b/vars/skipStage.groovy index bdd116f04..cc7bef6f4 100644 --- a/vars/skipStage.groovy +++ b/vars/skipStage.groovy @@ -227,7 +227,6 @@ boolean call(Map config = [:]) { prRepos('ubuntu20') == '') || prReposContains('ubuntu20', jobName()) || skip_stage_pragma('build-ubuntu20-rpm') - case 'Build on CentOS 8': case 'Build on CentOS 7 Bullseye': return skip_build_bullseye(target_branch, 'centos7') case 'Build on CentOS 8 Bullseye': @@ -542,13 +541,14 @@ boolean call(Map config = [:]) { !run_default_skipped_stage('test-el-8.8-rpms')) || (rpmTestVersion() != '') || stageAlreadyPassed() - case 'Test RPMs on EL 9.7': + case 'Test RPMs on EL 9': + case 'Test RPMs on EL 9.6': return !paramsValue('CI_RPMS_el9.7_TEST', true) || target_branch =~ branchTypeRE('weekly') || skip_stage_pragma('build-el9-rpm') || skip_stage_pragma('test') || skip_stage_pragma('test-rpms') || - skip_stage_pragma('test-el-9.7-rpms') || + skip_stage_pragma('test-el-9-rpms') || docOnlyChange(target_branch) || (quickFunctional() && !paramsValue('CI_RPMS_el9_7_TEST', true) && From 02e108214b3836b7117bbeb17fad807dcdc59715 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 19 Jan 2026 17:07:21 +0100 Subject: [PATCH 07/12] Update default distro to el9 Signed-off-by: Tomasz Gromadzki --- vars/hwDistroTarget2.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/hwDistroTarget2.groovy b/vars/hwDistroTarget2.groovy index 8990c424c..c3f758680 100644 --- a/vars/hwDistroTarget2.groovy +++ b/vars/hwDistroTarget2.groovy @@ -24,9 +24,9 @@ List call(String size) { // centos7 // el8 // NOTE: the default distro does not get set here below if the DAOS Jenkinsfile has a CI_HARDWARE_DISTRO parameter - String distro = cachedCommitPragma('EL8-target', 'el' + - cachedCommitPragma('EL8-version', - distroVersion('el8'))) + String distro = cachedCommitPragma('EL9-target', 'el' + + cachedCommitPragma('EL9-version', + distroVersion('el9'))) if (params.CI_HARDWARE_DISTRO) { distro = params.CI_HARDWARE_DISTRO } From ac66f9f752f2db68b812e178f362fb87e6d78888 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 20 Jan 2026 09:06:20 +0100 Subject: [PATCH 08/12] Increase checkout depth for daily-testing New depth == 100 Doc-only: true Signed-off-by: Tomasz Gromadzki --- src/com/intel/checkoutScmInternal.groovy | 2 +- vars/hwDistroTarget2.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/intel/checkoutScmInternal.groovy b/src/com/intel/checkoutScmInternal.groovy index dfdea94e8..32a8a34c1 100644 --- a/src/com/intel/checkoutScmInternal.groovy +++ b/src/com/intel/checkoutScmInternal.groovy @@ -60,7 +60,7 @@ def checkoutScmInternal(Map config = [:]) { Map params = [$class: scm_name, branches: branches, extensions: [[$class: 'CloneOption', noTags: true, - reference: '', shallow: false]], + reference: '', shallow: false, depth: 100]], submoduleCfg: [], userRemoteConfigs: userRemoteConfigs] if (config['pruneStaleBranch']) { diff --git a/vars/hwDistroTarget2.groovy b/vars/hwDistroTarget2.groovy index c3f758680..690a0ab4a 100644 --- a/vars/hwDistroTarget2.groovy +++ b/vars/hwDistroTarget2.groovy @@ -22,7 +22,7 @@ List call(String size) { // Possible return values: // leap15 // centos7 - // el8 + // el9 // NOTE: the default distro does not get set here below if the DAOS Jenkinsfile has a CI_HARDWARE_DISTRO parameter String distro = cachedCommitPragma('EL9-target', 'el' + cachedCommitPragma('EL9-version', From 1e655f86ce26d9c3d38741ef8f6491492d72ccc1 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 20 Jan 2026 09:16:42 +0100 Subject: [PATCH 09/12] DEBUG: print ditro/branch Doc-only: true Signed-off-by: Tomasz Gromadzki --- vars/distroVersion.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index c405c4f4d..aecfb3a4c 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -25,7 +25,8 @@ String call(String distro) { branch = releaseBranch() } } - + println("[distroVersion] distro=${distro}, branch=${branch}") + return distroVersion(distro, branch.replaceFirst(/^.*[\/-](\d+\.\d+).*$/, '\$1')) } From e992e428324950618c30bc23c46818d02cdfda02 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 21 Jan 2026 09:12:50 +0100 Subject: [PATCH 10/12] Revert "DEBUG: print ditro/branch" This reverts commit 1e655f86ce26d9c3d38741ef8f6491492d72ccc1. Signed-off-by: Tomasz Gromadzki --- vars/distroVersion.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index aecfb3a4c..c405c4f4d 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -25,8 +25,7 @@ String call(String distro) { branch = releaseBranch() } } - println("[distroVersion] distro=${distro}, branch=${branch}") - + return distroVersion(distro, branch.replaceFirst(/^.*[\/-](\d+\.\d+).*$/, '\$1')) } From f0b7788e3ded7755f090792e7c5767406bcef9cb Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 21 Jan 2026 09:17:04 +0100 Subject: [PATCH 11/12] Upgrade the default el8 to el8.10 (from el8.8) + upgrade default el from el7 to el9 Priority: 2 Signed-off-by: Tomasz Gromadzki --- vars/distroVersion.groovy | 12 ++++++------ vars/provisionNodes.groovy | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index c405c4f4d..d3d6ca0d6 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -30,9 +30,9 @@ String call(String distro) { } String call(String distro, String branch) { - return ['el8': ['master': '8.8', - '2.4': '8.8', - '2.6': '8.8'], + return ['el8': ['master': '8.10', + '2.4': '8.10', + '2.6': '8.10'], 'el9': ['master': '9.7', '2.6': '9.4'], 'leap15': ['master': '15.6', @@ -45,9 +45,9 @@ String call(String distro, String branch) { assert(call('leap15', '2.4') == '15.6') assert(call('leap15', '2.6') == '15.6') assert(call('leap15', 'master') == '15.6') -assert(call('el8', '2.4') == '8.8') -assert(call('el8', '2.6') == '8.8') -assert(call('el8', 'master') == '8.8') +assert(call('el8', '2.4') == '8.10') +assert(call('el8', '2.6') == '8.10') +assert(call('el8', 'master') == '8.10') assert(call('el9', 'master') == '9.7') assert(call('el9', '2.6') == '9.4') diff --git a/vars/provisionNodes.groovy b/vars/provisionNodes.groovy index 93a853a17..3784cf250 100644 --- a/vars/provisionNodes.groovy +++ b/vars/provisionNodes.groovy @@ -17,7 +17,7 @@ * @param config Map of parameters passed. * * config['arch'] Architecture to use. Default 'x86_64' - * config['distro'] Distribution to use. Default 'el7' + * config['distro'] Distribution to use. Default 'el9' * config['NODELIST'] Comma separated list of nodes available. * config['node_count'] Optional lower number of nodes to provision. * config['pool'] Optional pool from which to get image (i.e. test) @@ -93,7 +93,7 @@ Map call(Map config = [:]) { } String distro_type - String distro = config.get('distro', 'el7') + String distro = config.get('distro', 'el9') if (distro.startsWith('centos') || distro.startsWith('el') || distro.startsWith('rocky') || distro.startsWith('almalinux') || distro.startsWith('rhel')) { From b4feca76dbfccdd5cf05f86cfc21d5d2b6856966 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 21 Jan 2026 13:55:41 +0100 Subject: [PATCH 12/12] Revert to el8.8 from el8.10 Signed-off-by: Tomasz Gromadzki --- vars/distroVersion.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index d3d6ca0d6..c405c4f4d 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -30,9 +30,9 @@ String call(String distro) { } String call(String distro, String branch) { - return ['el8': ['master': '8.10', - '2.4': '8.10', - '2.6': '8.10'], + return ['el8': ['master': '8.8', + '2.4': '8.8', + '2.6': '8.8'], 'el9': ['master': '9.7', '2.6': '9.4'], 'leap15': ['master': '15.6', @@ -45,9 +45,9 @@ String call(String distro, String branch) { assert(call('leap15', '2.4') == '15.6') assert(call('leap15', '2.6') == '15.6') assert(call('leap15', 'master') == '15.6') -assert(call('el8', '2.4') == '8.10') -assert(call('el8', '2.6') == '8.10') -assert(call('el8', 'master') == '8.10') +assert(call('el8', '2.4') == '8.8') +assert(call('el8', '2.6') == '8.8') +assert(call('el8', 'master') == '8.8') assert(call('el9', 'master') == '9.7') assert(call('el9', '2.6') == '9.4')