diff --git a/etc/kayobe/ofed.yml b/etc/kayobe/ofed.yml index 7867206f6..bbfd332b4 100644 --- a/etc/kayobe/ofed.yml +++ b/etc/kayobe/ofed.yml @@ -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 @@ -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 diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index a27b0bab1..ce5d59228 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -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 +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 @@ -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 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 409e58c0d..32553d915 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -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. diff --git a/releasenotes/notes/rl9.7-c8d033f11097b76b.yaml b/releasenotes/notes/rl9.7-c8d033f11097b76b.yaml new file mode 100644 index 000000000..710685c23 --- /dev/null +++ b/releasenotes/notes/rl9.7-c8d033f11097b76b.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Added support for Rocky Linux 9.7. + - | + 9.7 is now the default release for Rocky Linux.