From 72e3668b999d8790c8f2af48cbcf86da42051fe3 Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Thu, 4 Dec 2025 16:58:23 +0100 Subject: [PATCH 1/3] Switch to Rocky Linux 9.7 and DOCA 3.2.1 - DOCA 3.2.1 for RL 9.7 - Bump Rocky 9 Security SIG repo, add source --- etc/kayobe/ofed.yml | 10 ++++++--- etc/kayobe/pulp-repo-versions.yml | 22 +++++++++++++++++-- etc/kayobe/pulp.yml | 4 ++-- .../notes/rl9.7-c8d033f11097b76b.yaml | 6 +++++ 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/rl9.7-c8d033f11097b76b.yaml diff --git a/etc/kayobe/ofed.yml b/etc/kayobe/ofed.yml index 7867206f64..bbfd332b49 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 a27b0bab1c..28c1fe6669 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: 20251219T205854 +stackhpc_pulp_repo_rocky_9_7_appstream_aarch64_version: 20251219T213344 +stackhpc_pulp_repo_rocky_9_7_appstream_source_version: 20251219T210713 +stackhpc_pulp_repo_rocky_9_7_baseos_version: 20251219T212218 +stackhpc_pulp_repo_rocky_9_7_baseos_aarch64_version: 20251219T213344 +stackhpc_pulp_repo_rocky_9_7_baseos_source_version: 20251219T210713 +stackhpc_pulp_repo_rocky_9_7_crb_version: 20251219T205854 +stackhpc_pulp_repo_rocky_9_7_crb_aarch64_version: 20251219T213344 +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: 20251219T205854 +stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20251219T213344 +stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20251220T210727 +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 409e58c0d6..32553d9158 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 0000000000..710685c233 --- /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. From ceff70ae351bbf2f51287bed75f3274b12409e77 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 22 Dec 2025 13:32:12 +0100 Subject: [PATCH 2/3] Fix path to DOCA repositories --- etc/kayobe/stackhpc.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 1138b07053..6639067451 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -49,11 +49,12 @@ stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_repo_distribution }}" # RPMs # DOCA -stackhpc_repo_rhel9_doca_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca/{{ stackhpc_pulp_doca_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/{{ stackhpc_repo_rhel9_doca_version }}" +stackhpc_doca_distribution: "{% if stackhpc_pulp_doca_version is version('3.2.0', '>=') %}rhel9{% else %}rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}{% endif %}" +stackhpc_repo_rhel9_doca_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca/{{ stackhpc_pulp_doca_version }}/{{ stackhpc_doca_distribution }}/x86_64/{{ stackhpc_repo_rhel9_doca_version }}" stackhpc_repo_rhel9_doca_version: "{{ stackhpc_repo_distribution }}" # DOCA Modules -stackhpc_repo_rhel9_doca_modules_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca-modules/{{ stackhpc_pulp_doca_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/{{ stackhpc_repo_rhel9_doca_modules_version }}" +stackhpc_repo_rhel9_doca_modules_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca-modules/{{ stackhpc_pulp_doca_version }}/{{ stackhpc_doca_distribution }}/x86_64/{{ stackhpc_repo_rhel9_doca_modules_version }}" stackhpc_repo_rhel9_doca_modules_version: "{{ stackhpc_repo_distribution }}" # Grafana From 7e960c32c6b04dd7554b01e15d91e99ed58bff38 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 22 Dec 2025 17:05:48 +0100 Subject: [PATCH 3/3] [skip ci] Debug DOCA repositories --- .github/workflows/package-build-ofed.yml | 11 ++++++++++- etc/kayobe/ansible/tools/growroot.yml | 11 +++++++++++ .../environments/ci-doca-builder/stackhpc-ci.yml | 3 +++ etc/kayobe/pulp-repo-versions.yml | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package-build-ofed.yml b/.github/workflows/package-build-ofed.yml index 31ae34f473..ea8bc46e7c 100644 --- a/.github/workflows/package-build-ofed.yml +++ b/.github/workflows/package-build-ofed.yml @@ -233,11 +233,20 @@ jobs: run: | source venvs/kayobe/bin/activate && source src/kayobe-config/kayobe-env --environment ci-doca-builder && - kayobe playbook run src/kayobe-config/etc/kayobe/ansible/push-ofed.yml \ + kayobe playbook run src/kayobe-config/etc/kayobe/ansible/tools/push-ofed.yml \ -e "ofed_tag=${{ steps.ofed_tag.outputs.ofed_tag }}" env: KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }} + - name: Display DNF repositories + run: | + source venvs/kayobe/bin/activate && + source src/kayobe-config/kayobe-env --environment ci-doca-builder && + kayobe playbook run src/kayobe-config/etc/kayobe/ansible/tools/growroot.yml + env: + KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }} + if: always() + - name: Destroy run: terraform destroy -auto-approve working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio diff --git a/etc/kayobe/ansible/tools/growroot.yml b/etc/kayobe/ansible/tools/growroot.yml index 6525c2107e..e6c30a1370 100644 --- a/etc/kayobe/ansible/tools/growroot.yml +++ b/etc/kayobe/ansible/tools/growroot.yml @@ -29,6 +29,17 @@ growroot_ignore_lvm_check: false tasks: + - name: Display DNF repositories + command: dnf repoinfo + register: repoinfo + become: true + + - debug: + var: repoinfo.stdout + + - debug: + var: repoinfo.stderr + - name: Check LVM status ansible.builtin.shell: executable: "/bin/bash" diff --git a/etc/kayobe/environments/ci-doca-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-doca-builder/stackhpc-ci.yml index a6e66db544..e3cc8dd3e2 100644 --- a/etc/kayobe/environments/ci-doca-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-doca-builder/stackhpc-ci.yml @@ -7,3 +7,6 @@ stackhpc_repos_enabled: true enable_docker_repo: false dnf_install_doca: true dnf_enable_doca_modules: false + +# Disable Pulp auth proxy (deployed too late for DOCA DNF repository setup). +stackhpc_repo_mirror_auth_proxy_enabled: false diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 28c1fe6669..6acd9d9241 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -20,6 +20,7 @@ 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_doca_3_2_1_rhel9_modules_version: null stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250616T155742 stackhpc_pulp_repo_elrepo_9_version: 20250610T235426 stackhpc_pulp_repo_elrepo_9_aarch64_version: 20250408T030629