Skip to content

SRE-3534 ci: update to el9.7 #489

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

Open
grom72 wants to merge 12 commits into
base: master
Choose a base branch
from
+71 −25
Open

SRE-3534 ci: update to el9.7 #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
10e01b2
SRE-3522 ci: update to el9.7
grom72 Jan 12, 2026
176f5bc
Do not change release/2.6 settings
grom72 Jan 14, 2026
401066c
Fix el9 missing issue
grom72 Jan 15, 2026
4d2bb37
Add missing skip case for Functional tests
grom72 Jan 16, 2026
9253da6
Extend skipStage logic to cover all EL9.7 cases
grom72 Jan 16, 2026
6baf46a
Upgrade default el7 to el9
grom72 Jan 19, 2026
02e1082
Update default distro to el9
grom72 Jan 19, 2026
ac66f9f
Increase checkout depth for daily-testing
grom72 Jan 20, 2026
1e655f8
DEBUG: print ditro/branch
grom72 Jan 20, 2026
e992e42
Revert "DEBUG: print ditro/branch"
grom72 Jan 21, 2026
f0b7788
Upgrade the default el8 to el8.10 (from el8.8)
grom72 Jan 21, 2026
b4feca7
Revert to el8.8 from el8.10
grom72 Jan 21, 2026
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
2 changes: 1 addition & 1 deletion ci/provisioning/post_provision_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/com/intel/checkoutScmInternal.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']) {
Expand Down
4 changes: 2 additions & 2 deletions vars/distroVersion.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ String call(String distro, String branch) {
return ['el8': ['master': '8.8',
'2.4': '8.8',
'2.6': '8.8'],
'el9': ['master': '9.4',
'el9': ['master': '9.7',
'2.6': '9.4'],
'leap15': ['master': '15.6',
'2.4': '15.6',
Expand All @@ -48,7 +48,7 @@ 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', 'master') == '9.7')
assert(call('el9', '2.6') == '9.4')
Copy link
Collaborator

@JohnMalmberg JohnMalmberg Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should get this bumped to 9.7 also. We can not support older el-9 in hardware CI.

Copy link
Contributor Author

@grom72 grom72 Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't, as we can not build 2.6 on 9.7
But we do not need as we do not test 2.6 against el9 at all.

Copy link
Contributor

@phender phender Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do test release/2.6 against EL9. In https://jenkins.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/release%252F2.6/226/pipeline-overview/ we build DAOS RPMs against EL9. Also, the daily-2.6-testing and weekly-2.6.-testing branches run a Functional VM stage on EL9. In https://jenkins.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/daily-2.6-testing/179/ it ran on 9.7.

Copy link
Contributor Author

@grom72 grom72 Jan 21, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, but the problem is with RPM build which does not work on 9.7 (but works on 9.4).

Upgrade VM tests to use EL9.7 is configured directly in the restore_vm_partition.sh script where 9.7 is used as default.


/* Uncomment to do further testing
Expand Down
8 changes: 4 additions & 4 deletions vars/hwDistroTarget2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ 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('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
}
Expand Down
4 changes: 3 additions & 1 deletion vars/prRepos.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
8 changes: 5 additions & 3 deletions vars/provisionNodes.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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')) {
Expand Down Expand Up @@ -142,9 +142,11 @@ Map call(Map config = [:]) {
provision_script += 'EL_7'
break
case 'el8':
case 'el9':
provision_script += 'EL_8'
break
case 'el9':
Copy link
Collaborator

@JohnMalmberg JohnMalmberg Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Future enhancement is to just be "EL", as EL-[8-10] do not appear to have much differences, so that this can simplify the number of scripts.

provision_script += 'EL_9'
break
case 'suse':
provision_script += 'LEAP_15'
break
Expand Down
6 changes: 3 additions & 3 deletions vars/provisionNodesV1.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'.
Expand Down Expand Up @@ -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") ||
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions vars/quickBuildDeps.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()")
}
Expand Down
57 changes: 47 additions & 10 deletions vars/skipStage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -228,10 +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 EL 8':
Copy link
Collaborator

@JohnMalmberg JohnMalmberg Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently these removals are not affecting Release 2.6?
Release 2.6 should really have been using "EL 8" and not "CentOS 8"

Copy link
Contributor Author

@grom72 grom72 Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is redundant code.

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':
Expand Down Expand Up @@ -312,11 +307,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') ||
Expand All @@ -328,8 +329,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()
Expand All @@ -355,6 +355,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()
Expand All @@ -369,6 +371,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') ||
Expand All @@ -379,6 +385,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') ||
Expand Down Expand Up @@ -417,11 +427,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('el9', 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':
Expand All @@ -443,6 +457,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') ||
Expand Down Expand Up @@ -518,6 +541,20 @@ boolean call(Map config = [:]) {
!run_default_skipped_stage('test-el-8.8-rpms')) ||
(rpmTestVersion() != '') ||
stageAlreadyPassed()
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-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
Expand Down