Add Rocky 9/10 aarch64 overcloud host image support (#2279)

Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>

Author: bbezak

.github/workflows/overcloud-host-image-build.yml

@@ -7,10 +7,18 @@ on:
         description: Promote Rocky Linux 9
         type: boolean
         default: true
+      rocky9-aarch64:
+        description: Promote Rocky Linux 9 aarch64
+        type: boolean
+        default: false
       rocky10:
         description: Promote Rocky Linux 10
         type: boolean
         default: true
+      rocky10-aarch64:
+        description: Promote Rocky Linux 10 aarch64
+        type: boolean
+        default: false
       ubuntu-noble:
         description: Promote Ubuntu 24.04 Noble
         type: boolean
@@ -25,7 +33,7 @@ jobs:
     steps:
       - name: Validate inputs
         run: |
-          if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.rocky10 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
+          if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.rocky9-aarch64 }} == 'false' && ${{ inputs.rocky10 }} == 'false' && ${{ inputs.rocky10-aarch64 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
             echo "At least one distribution must be selected"
             exit 1
           fi
@@ -85,6 +93,20 @@ jobs:
         working-directory: src/kayobe-config
         if: inputs.rocky10
 
+      - name: Gather Rocky Linux 9 aarch64 overcloud host image tag
+        id: rocky9_aarch64_image_tag
+        run: |
+          echo image_tag=$(grep stackhpc_rocky_9_overcloud_host_image_version_aarch64: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
+        working-directory: src/kayobe-config
+        if: inputs.rocky9-aarch64
+
+      - name: Gather Rocky Linux 10 aarch64 overcloud host image tag
+        id: rocky10_aarch64_image_tag
+        run: |
+          echo image_tag=$(grep stackhpc_rocky_10_overcloud_host_image_version_aarch64: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
+        working-directory: src/kayobe-config
+        if: inputs.rocky10-aarch64
+
       - name: Gather Ubuntu Noble overcloud host image tag
         id: ubuntu_noble_image_tag
         run: |
@@ -120,6 +142,38 @@ jobs:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
         if: inputs.rocky10
 
+      - name: Promote Rocky Linux 9 aarch64 overcloud host image artifact
+        run: |
+          source venvs/kayobe/bin/activate &&
+          source src/kayobe-config/kayobe-env --environment ci-builder &&
+          kayobe playbook run \
+          src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-promote.yml \
+          -e artifact_type="kayobe-images" \
+          -e os_distribution='rocky' \
+          -e os_release='9' \
+          -e promotion_tag=${{ steps.rocky9_aarch64_image_tag.outputs.image_tag }} \
+          -e repository_name="kayobe-images-${{ steps.openstack_release.outputs.openstack_release }}-rocky-9-aarch64" \
+          -e pulp_base_path="kayobe-images/${{ steps.openstack_release.outputs.openstack_release }}/rocky/9/aarch64"
+        env:
+          KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
+        if: inputs.rocky9-aarch64
+
+      - name: Promote Rocky Linux 10 aarch64 overcloud host image artifact
+        run: |
+          source venvs/kayobe/bin/activate &&
+          source src/kayobe-config/kayobe-env --environment ci-builder &&
+          kayobe playbook run \
+          src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-promote.yml \
+          -e artifact_type="kayobe-images" \
+          -e os_distribution='rocky' \
+          -e os_release='10' \
+          -e promotion_tag=${{ steps.rocky10_aarch64_image_tag.outputs.image_tag }} \
+          -e repository_name="kayobe-images-${{ steps.openstack_release.outputs.openstack_release }}-rocky-10-aarch64" \
+          -e pulp_base_path="kayobe-images/${{ steps.openstack_release.outputs.openstack_release }}/rocky/10/aarch64"
+        env:
+          KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
+        if: inputs.rocky10-aarch64
+
       - name: Promote Ubuntu Noble 24.04 overcloud host image artifact
         run: |
           source venvs/kayobe/bin/activate &&

.github/workflows/overcloud-host-image-promote.yml

@@ -7,9 +7,15 @@ on:
       rocky9_tag:
         description: Overcloud host image tag for Rocky 9
         type: string
+      rocky9_aarch64_tag:
+        description: Overcloud host image tag for Rocky 9 aarch64
+        type: string
       rocky10_tag:
         description: Overcloud host image tag for Rocky 10
         type: string
+      rocky10_aarch64_tag:
+        description: Overcloud host image tag for Rocky 10 aarch64
+        type: string
       ubuntu_noble_tag:
         description: Overcloud host image tag for Ubuntu
         type: string
@@ -31,17 +37,27 @@ jobs:
 
       - name: Update Rocky 9 overcloud host image tag
         run: |
-          sed -i "/stackhpc_rocky_9_overcloud_host_image_version/s/.*/stackhpc_rocky_9_overcloud_host_image_version: ${{ inputs.rocky9_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
+          sed -i "/^stackhpc_rocky_9_overcloud_host_image_version:/s/.*/stackhpc_rocky_9_overcloud_host_image_version: ${{ inputs.rocky9_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
         if: "${{ inputs.rocky9_tag != '' }}"
 
+      - name: Update Rocky 9 aarch64 overcloud host image tag
+        run: |
+          sed -i "/^stackhpc_rocky_9_overcloud_host_image_version_aarch64:/s/.*/stackhpc_rocky_9_overcloud_host_image_version_aarch64: ${{ inputs.rocky9_aarch64_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
+        if: "${{ inputs.rocky9_aarch64_tag != '' }}"
+
       - name: Update Rocky 10 overcloud host image tag
         run: |
-          sed -i "/stackhpc_rocky_10_overcloud_host_image_version/s/.*/stackhpc_rocky_10_overcloud_host_image_version: ${{ inputs.rocky10_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
+          sed -i "/^stackhpc_rocky_10_overcloud_host_image_version:/s/.*/stackhpc_rocky_10_overcloud_host_image_version: ${{ inputs.rocky10_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
         if: "${{ inputs.rocky10_tag != '' }}"
 
+      - name: Update Rocky 10 aarch64 overcloud host image tag
+        run: |
+          sed -i "/^stackhpc_rocky_10_overcloud_host_image_version_aarch64:/s/.*/stackhpc_rocky_10_overcloud_host_image_version_aarch64: ${{ inputs.rocky10_aarch64_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
+        if: "${{ inputs.rocky10_aarch64_tag != '' }}"
+
       - name: Update Ubuntu Noble overcloud host image tag
         run: |
-          sed -i "/stackhpc_ubuntu_noble_overcloud_host_image_version/s/.*/stackhpc_ubuntu_noble_overcloud_host_image_version: ${{ inputs.ubuntu_noble_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
+          sed -i "/^stackhpc_ubuntu_noble_overcloud_host_image_version:/s/.*/stackhpc_ubuntu_noble_overcloud_host_image_version: ${{ inputs.ubuntu_noble_tag }}/" ${{ github.workspace }}/src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml
         if: "${{ inputs.ubuntu_noble_tag != '' }}"
 
       - name: Propose changes via PR if required
@@ -51,15 +67,17 @@ jobs:
           commit-message: >-
             Bump overcloud host image tags
           author: stackhpc-ci <22933334+stackhpc-ci@users.noreply.github.com>
-          branch: bump-overcloud-host-images-${{ inputs.rocky9_tag }}-${{ inputs.rocky10_tag }}-${{ inputs.ubuntu_noble_tag }}
+          branch: bump-overcloud-host-images-${{ inputs.rocky9_tag }}-${{ inputs.rocky9_aarch64_tag }}-${{ inputs.rocky10_tag }}-${{ inputs.rocky10_aarch64_tag }}-${{ inputs.ubuntu_noble_tag }}
           delete-branch: true
           title: >-
             Bump overcloud host image tags 
           body: |
             This PR was created automatically to update the overcloud host image
             tags.
             Rocky 9: ${{ inputs.rocky9_tag }}
+            Rocky 9 aarch64: ${{ inputs.rocky9_aarch64_tag }}
             Rocky 10: ${{ inputs.rocky10_tag }}
+            Rocky 10 aarch64: ${{ inputs.rocky10_aarch64_tag }}
             Ubuntu Noble: ${{ inputs.ubuntu_noble_tag }}
           labels: |
             automated

.github/workflows/update-overcloud-host-image-tags.yml

@@ -20,12 +20,18 @@ in ``etc/kayobe/stackhpc-overcloud-host-images.yml``.
 Currently, images exist for the following operating systems:
 
 * Rocky Linux 9
+* Rocky Linux 10
 * Ubuntu Noble 24.04
 
 The image to download is selected automatically using the ``os_distribution``
 and ``os_release`` variables. These images are versioned and a variable for
 each OS is stored in ``pulp-host-image-versions.yml``.
 
+The architecture of the Rocky Linux release train overcloud host images can be
+selected using ``stackhpc_overcloud_host_image_arch``. Valid values are
+``amd64`` and ``aarch64``. Rocky Linux 9 and Rocky Linux 10 ``aarch64`` images
+use separate version variables in ``pulp-host-image-versions.yml``.
+
 This content requires the same set of credentials as is used for other
 release train content.
 

doc/source/configuration/host-images.rst

@@ -6,7 +6,7 @@
     # without the auth credentials in it. Auth is handled by username and
     # password in the get_url task of this playbook
     stackhpc_overcloud_host_image_url_no_auth: "{{ stackhpc_release_pulp_content_url }}/kayobe-images/\
-      {{ openstack_release }}/{{ os_distribution }}/{{ os_release }}/\
+      {{ openstack_release }}/{{ os_distribution }}/{{ os_release }}{{ '/aarch64' if os_distribution == 'rocky' and stackhpc_overcloud_host_image_arch == 'aarch64' else '' }}/\
       {{ stackhpc_overcloud_host_image_version }}/\
       overcloud-{{ os_distribution }}-{{ os_release }}.qcow2"
   tasks:

etc/kayobe/ansible/pulp/pulp-host-image-download.yml

@@ -40,6 +40,7 @@
             name: "{{ image_name }}"
             container_format: bare
             disk_format: qcow2
+            properties: "{{ image_properties | default(omit) }}"
             state: present
             filename: "{{ local_image_path }}"
 

etc/kayobe/ansible/tools/openstack-host-image-upload.yml

@@ -1,6 +1,8 @@
 ---
 # Overcloud host image versioning tags
 # These images must be in SMS, since they are used by our AIO CI runners
-stackhpc_rocky_9_overcloud_host_image_version: 2025.1-20260306T094256
-stackhpc_rocky_10_overcloud_host_image_version: 2025.1-20260318T110608
-stackhpc_ubuntu_noble_overcloud_host_image_version: 2025.1-20260206T132408
+stackhpc_rocky_9_overcloud_host_image_version: 2025.1-20260420T162634
+stackhpc_rocky_9_overcloud_host_image_version_aarch64: 2025.1-20260420T162634
+stackhpc_rocky_10_overcloud_host_image_version: 2025.1-20260420T162634
+stackhpc_rocky_10_overcloud_host_image_version_aarch64: 2025.1-20260420T162634
+stackhpc_ubuntu_noble_overcloud_host_image_version: 2025.1-20260420T162634

etc/kayobe/pulp-host-image-versions.yml

@@ -8,15 +8,19 @@ stackhpc_download_overcloud_host_images: false
 # Whether or not to build overcloud host images from Ark
 stackhpc_build_overcloud_image_from_pulp_package_mirrors: false
 
+# Architecture of the Release Train overcloud host images to consume.
+# Valid values are amd64 and aarch64.
+stackhpc_overcloud_host_image_arch: amd64
+
 # The overcloud host image source, defined by os_distribution, os_release,
 # and the current stable version.
 stackhpc_overcloud_host_image_url: "{{ stackhpc_release_pulp_content_url_with_auth }}/kayobe-images/\
-                                    {{ openstack_release }}/{{ os_distribution }}/{{ os_release }}/\
+                                    {{ openstack_release }}/{{ os_distribution }}/{{ os_release }}{{ '/aarch64' if os_distribution == 'rocky' and stackhpc_overcloud_host_image_arch == 'aarch64' else '' }}/\
                                     {{ stackhpc_overcloud_host_image_version }}/\
                                     overcloud-{{ os_distribution }}-{{ os_release }}.qcow2"
 
 # Overcloud host image version tag selection
 stackhpc_overcloud_host_image_version: >-
-  {{ stackhpc_rocky_9_overcloud_host_image_version if os_distribution == 'rocky' and os_release == '9' else
-  stackhpc_rocky_10_overcloud_host_image_version if os_distribution == 'rocky' and os_release == '10' else
-  stackhpc_ubuntu_noble_overcloud_host_image_version if os_distribution == 'ubuntu' and os_release == 'noble' }}
+  {{ lookup('vars', 'stackhpc_' ~ os_distribution ~ '_' ~ os_release ~
+     '_overcloud_host_image_version' ~
+     ('_aarch64' if os_distribution == 'rocky' and stackhpc_overcloud_host_image_arch == 'aarch64' else '')) }}

etc/kayobe/stackhpc-overcloud-host-images.yml

@@ -0,0 +1,5 @@
+features:
+  - |
+    Add Rocky Linux 9 and Rocky Linux 10 ``aarch64`` overcloud host image
+    build and promotion support. The architecture consumed from Ark can be
+    selected with ``stackhpc_overcloud_host_image_arch``.