Skip to content

Commit c94372e

Browse files
committed
Switch to Rocky Linux 9.7, DOCA 3.2.1
- DOCA 3.2.1 for RL 9.7 - bump rocky 9 security sig repo, add source
1 parent f5d1992 commit c94372e

File tree

4 files changed

+35
-7
lines changed

4 files changed

+35
-7
lines changed

etc/kayobe/ofed.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
###############################################################################
55
# DOCA host version
6-
stackhpc_pulp_doca_version: "{{ '2.9.3' if stackhpc_pulp_repo_rocky_9_minor_version == '6' else '2.9.1' }}"
6+
stackhpc_pulp_doca_version_matrix:
7+
"6": 2.9.3
8+
"7": 3.2.1
9+
stackhpc_pulp_doca_version: "{{ stackhpc_pulp_doca_version_matrix[stackhpc_pulp_repo_rocky_9_minor_version] | default('2.9.1') }}"
710

811
###############################################################################
912
# Pulp configuration for DOCA OFED
@@ -12,8 +15,9 @@ stackhpc_pulp_doca_version: "{{ '2.9.3' if stackhpc_pulp_repo_rocky_9_minor_vers
1215
stackhpc_pulp_sync_ofed: "{{ groups['mlnx'] | length > 0 }}"
1316

1417
# DOCA Snapshot lookup vars
15-
doca_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_version"
16-
doca_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_version"
18+
doca_distribution: "{% if stackhpc_pulp_doca_version is version('3.2.0', '>=') %}rhel9{% else %}rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}{% endif %}"
19+
doca_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_{{ doca_distribution }}_version"
20+
doca_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_{{ doca_distribution }}_modules_version"
1721

1822
# DOCA Snapshot versions. The defaults use the appropriate version from
1923
# pulp-repo-versions.yml

etc/kayobe/pulp-repo-versions.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ stackhpc_pulp_repo_doca_2_9_1_rhel9_5_version: 20241211T171301
1818
stackhpc_pulp_repo_doca_2_9_1_rhel9_5_modules_version: 20250115T150314
1919
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version: 20250703T135021
2020
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_modules_version: 20250714T141841
21+
stackhpc_pulp_repo_doca_3_2_0_rhel9_version: 20251204T124815
22+
stackhpc_pulp_repo_doca_3_2_1_rhel9_version: 20251219T132023
2123
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250616T155742
2224
stackhpc_pulp_repo_elrepo_9_version: 20250610T235426
2325
stackhpc_pulp_repo_elrepo_9_aarch64_version: 20250408T030629
@@ -76,8 +78,24 @@ stackhpc_pulp_repo_rocky_9_6_extras_version: 20250726T040613
7678
stackhpc_pulp_repo_rocky_9_6_extras_aarch64_version: 20250726T045704
7779
stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
7880
stackhpc_pulp_repo_rocky_9_6_highavailability_aarch64_version: 20250605T150141
79-
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20250222T040303
80-
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20250222T044743
81+
stackhpc_pulp_repo_rocky_9_7_appstream_version: 20251218T205602
82+
stackhpc_pulp_repo_rocky_9_7_appstream_aarch64_version: 20251218T213824
83+
stackhpc_pulp_repo_rocky_9_7_appstream_source_version: 20251218T211724
84+
stackhpc_pulp_repo_rocky_9_7_baseos_version: 20251218T212255
85+
stackhpc_pulp_repo_rocky_9_7_baseos_aarch64_version: 20251218T213824
86+
stackhpc_pulp_repo_rocky_9_7_baseos_source_version: 20251218T211724
87+
stackhpc_pulp_repo_rocky_9_7_crb_version: 20251214T205707
88+
stackhpc_pulp_repo_rocky_9_7_crb_aarch64_version: 20251214T213806
89+
stackhpc_pulp_repo_rocky_9_7_crb_source_version: 20251203T103807
90+
stackhpc_pulp_repo_rocky_9_7_extras_version: 20251218T205602
91+
stackhpc_pulp_repo_rocky_9_7_extras_aarch64_version: 20251218T213824
92+
stackhpc_pulp_repo_rocky_9_7_extras_source_version: 20251218T211724
93+
stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20251206T205608
94+
stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20251206T213753
95+
stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20251203T103807
96+
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20251108T211425
97+
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20251109T211404
98+
stackhpc_pulp_repo_rocky_9_sig_security_common_source_version: 20251203T103807
8199
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250620T063939
82100
stackhpc_pulp_repo_ubuntu_noble_security_version: 20250620T113028
83101
stackhpc_pulp_repo_ubuntu_noble_version: 20250620T113028

etc/kayobe/pulp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ stackhpc_pulp_distribution_deb_production: >-
200200

201201
# Whether to sync Rocky Linux 9 packages.
202202
stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
203-
# Rocky 9 minor version number. Supported values: 6. Default is 6
204-
stackhpc_pulp_repo_rocky_9_minor_version: '6'
203+
# Rocky 9 minor version number. Supported values: 6, 7. Default is 7
204+
stackhpc_pulp_repo_rocky_9_minor_version: '7'
205205
# Rocky 9 Snapshot versions. The defaults use the appropriate version from
206206
# pulp-repo-versions.yml for the selected minor release.
207207

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Added support for Rocky Linux 9.7.
5+
- |
6+
9.7 is now the default release for Rocky Linux.

0 commit comments

Comments
 (0)