CI: Fix DOCA repo version var naming

Author: Alex-Welsh

.github/workflows/package-build-ofed.yml

@@ -28,6 +28,11 @@ jobs:
     runs-on: arc-skc-host-image-builder-runner
     permissions: {}
     steps:
+      - name: Generate OFED tag
+        id: ofed_tag
+        run: |
+          echo "ofed_tag=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
+
       - name: Install Package
         uses: ConorMacBride/install-package@main
         with:
@@ -42,32 +47,14 @@ jobs:
         with:
           path: src/kayobe-config
 
-      - name: Determine OpenStack release
-        id: openstack_release
-        run: |
-          BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
-          echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
-
-      - name: Generate OFED tag
-        id: ofed_tag
-        run: |
-          echo "ofed_tag=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
-
-      - name: Clone StackHPC Kayobe repository
-        uses: actions/checkout@v4
-        with:
-          repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}
-          path: src/kayobe
-
       - name: Install Kayobe
         run: |
           mkdir -p venvs &&
           pushd venvs &&
           python3 -m venv kayobe &&
           source kayobe/bin/activate &&
           pip install -U pip &&
-          pip install ../src/kayobe
+          pip install -r ../src/kayobe-config/requirements.txt
 
       - name: Install terraform
         uses: hashicorp/setup-terraform@v2

etc/kayobe/ofed.yml

@@ -3,18 +3,22 @@
 
 ###############################################################################
 # DOCA host version
-stackhpc_pulp_doca_version: 2.9.1
+stackhpc_pulp_doca_version: "{{ '2.9.3' if stackhpc_pulp_repo_rocky_9_minor_version == '6' else '2.9.1' }}"
 
 ###############################################################################
 # Pulp configuration for DOCA OFED
 
 # Whether to sync OFED repositories into the local Pulp service
 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 Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml
-stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel_9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_doca_version') }}"
-stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel_9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_doca_modules_version') }}"
+stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_modules_version_lookup_var) }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/pulp-repo-versions.yml

@@ -57,11 +57,9 @@ stackhpc_pulp_repo_ubuntu_jammy_security_version: 20250417T070229
 stackhpc_pulp_repo_ubuntu_jammy_version: 20250417T070229
 stackhpc_pulp_repo_ubuntu_noble_security_version: 20250417T033501
 stackhpc_pulp_repo_ubuntu_noble_version: 20250417T033501
-stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
-stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
-stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
-stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
-##### NOTE: Dummy variables, currently no RL9.6 DOCA
-stackhpc_pulp_repo_rhel_9_6_doca_modules_version: 00000000T000000
-stackhpc_pulp_repo_rhel_9_6_doca_version: 00000000T000000
-######
+stackhpc_pulp_repo_doca_2_9_1_rhel9_4_version: 20241211T153620
+stackhpc_pulp_repo_doca_2_9_1_rhel9_4_modules_version: 20241213T112245
+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

etc/kayobe/pulp.yml

@@ -243,7 +243,7 @@ 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: 1, 2, 3, 4, 5, 6. Default is 6
-stackhpc_pulp_repo_rocky_9_minor_version: 6
+stackhpc_pulp_repo_rocky_9_minor_version: '6'
 # Rocky 9 Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml for the selected minor release.
 stackhpc_pulp_repo_rocky_9_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"

releasenotes/notes/doca-2-9-3-238838fb78e0c7d9.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Added support for DOCA OFED on Rocky Linux 9.6 at version ``2.9.3``. The
+    package versions for Rocky 9.4 and 9.5 remain unchanged, using ``2.9.1``.