Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions etc/kayobe/ofed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@

###############################################################################
# DOCA host version
stackhpc_pulp_doca_version: "{{ '2.9.3' if stackhpc_pulp_repo_rocky_9_minor_version == '6' else '2.9.1' }}"
stackhpc_pulp_doca_version_matrix:
"6": 2.9.3
"7": 3.2.1
stackhpc_pulp_doca_version: "{{ stackhpc_pulp_doca_version_matrix[stackhpc_pulp_repo_rocky_9_minor_version] | default('2.9.1') }}"

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

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

# DOCA Snapshot versions. The defaults use the appropriate version from
# pulp-repo-versions.yml
Expand Down
22 changes: 20 additions & 2 deletions etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ stackhpc_pulp_repo_doca_2_9_1_rhel9_5_version: 20241211T171301
stackhpc_pulp_repo_doca_2_9_1_rhel9_5_modules_version: 20250115T150314
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version: 20250703T135021
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_modules_version: 20250714T141841
stackhpc_pulp_repo_doca_3_2_0_rhel9_version: 20251204T124815
Copy link
Member

Choose a reason for hiding this comment

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

This will fail with No variable found with this name: stackhpc_pulp_repo_doca_2_9_1_rhel9_7_version, see https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/2025.1/etc/kayobe/ofed.yml#L15

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thank you Piotr. I'll provide a fix shortly

Copy link
Contributor Author

Choose a reason for hiding this comment

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

see doca_distribution in etc/kayobe/ofed.yml

stackhpc_pulp_repo_doca_3_2_1_rhel9_version: 20251219T132023
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250616T155742
stackhpc_pulp_repo_elrepo_9_version: 20250610T235426
stackhpc_pulp_repo_elrepo_9_aarch64_version: 20250408T030629
Expand Down Expand Up @@ -76,8 +78,24 @@ stackhpc_pulp_repo_rocky_9_6_extras_version: 20250726T040613
stackhpc_pulp_repo_rocky_9_6_extras_aarch64_version: 20250726T045704
stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
stackhpc_pulp_repo_rocky_9_6_highavailability_aarch64_version: 20250605T150141
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20250222T040303
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20250222T044743
stackhpc_pulp_repo_rocky_9_7_appstream_version: 20251218T205602
stackhpc_pulp_repo_rocky_9_7_appstream_aarch64_version: 20251218T213824
stackhpc_pulp_repo_rocky_9_7_appstream_source_version: 20251218T211724
stackhpc_pulp_repo_rocky_9_7_baseos_version: 20251218T212255
stackhpc_pulp_repo_rocky_9_7_baseos_aarch64_version: 20251218T213824
stackhpc_pulp_repo_rocky_9_7_baseos_source_version: 20251218T211724
stackhpc_pulp_repo_rocky_9_7_crb_version: 20251214T205707
stackhpc_pulp_repo_rocky_9_7_crb_aarch64_version: 20251214T213806
stackhpc_pulp_repo_rocky_9_7_crb_source_version: 20251203T103807
stackhpc_pulp_repo_rocky_9_7_extras_version: 20251218T205602
stackhpc_pulp_repo_rocky_9_7_extras_aarch64_version: 20251218T213824
stackhpc_pulp_repo_rocky_9_7_extras_source_version: 20251218T211724
stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20251206T205608
stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20251206T213753
stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20251203T103807
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20251108T211425
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20251109T211404
stackhpc_pulp_repo_rocky_9_sig_security_common_source_version: 20251203T103807
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250620T063939
stackhpc_pulp_repo_ubuntu_noble_security_version: 20250620T113028
stackhpc_pulp_repo_ubuntu_noble_version: 20250620T113028
4 changes: 2 additions & 2 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ stackhpc_pulp_distribution_deb_production: >-

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

Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/rl9.7-c8d033f11097b76b.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
features:
- |
Added support for Rocky Linux 9.7.
- |
9.7 is now the default release for Rocky Linux.