fix up

Author: cityofships

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

@@ -262,6 +262,19 @@ jobs:
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
 
+      - name: Build a Rocky Linux 9 ${{ matrix.arch }} overcloud host image
+        id: build_rocky_9
+        run: |
+          source venvs/kayobe/bin/activate &&
+          source src/kayobe-config/kayobe-env --environment ci-builder &&
+          kayobe overcloud host image build --force-rebuild \
+          -e os_distribution="rocky" \
+          -e os_release="9" \
+          -e stackhpc_overcloud_dib_name=overcloud-rocky-9
+        env:
+          KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+        if: inputs.rocky9 && matrix.arch == 'x86_64'
+
       - name: Build a Rocky Linux 9 ${{ matrix.arch }} overcloud host image
         id: build_rocky_9
         run: |
@@ -273,7 +286,7 @@ jobs:
           -e stackhpc_overcloud_dib_name=overcloud-rocky-9-${{ matrix.arch }}
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
-        if: inputs.rocky9
+        if: inputs.rocky9 && matrix.arch == 'arm64'
 
       - name: Show last error logs
         continue-on-error: true
@@ -285,6 +298,22 @@ jobs:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: steps.build_rocky_9.outcome == 'failure'
 
+      - name: Upload Rocky Linux 9 ${{ matrix.arch }} overcloud host image to Ark
+        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-artifact-upload.yml \
+          -e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
+          -e artifact_tag=${{ needs.create-tag.outputs.host_image_tag }} \
+          -e artifact_type="kayobe-images" \
+          -e file_regex="*.qcow2" \
+          -e os_distribution="rocky" \
+          -e os_release="9" -vvv
+        env:
+          KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success' && matrix.arch == 'x86_64'
+
       - name: Upload Rocky Linux 9 ${{ matrix.arch }} overcloud host image to Ark
         run: |
           source venvs/kayobe/bin/activate &&
@@ -299,7 +328,7 @@ jobs:
           -e os_release="9" -vvv
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
-        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
+        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success' && matrix.arch == 'arm64'
 
       - name: Upload Rocky Linux 9 ${{ matrix.arch }} overcloud host image to current Dev Cloud (SMS/Leafcloud)
         run: |
@@ -313,7 +342,7 @@ jobs:
           CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
           OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
-        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
+        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success' && matrix.arch == 'arm64'
 
       - name: Upload Rocky Linux 9 ${{ matrix.arch }} overcloud host image to other Dev Cloud (Leafcloud/SMS)
         run: |
@@ -327,7 +356,35 @@ jobs:
           CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
           OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
-        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
+        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success' && matrix.arch == 'arm64'
+
+      - name: Upload Rocky Linux 9 ${{ matrix.arch }} overcloud host image to current Dev Cloud (SMS/Leafcloud)
+        run: |
+          source venvs/kayobe/bin/activate &&
+          source src/kayobe-config/kayobe-env --environment ci-builder &&
+          kayobe playbook run \
+          src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
+          -e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
+          -e image_name=overcloud-rocky-9-${{ needs.create-tag.outputs.host_image_tag }}
+        env:
+          CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
+          OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
+          OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
+        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success' && matrix.arch == 'x86_64'
+
+      - name: Upload Rocky Linux 9 ${{ matrix.arch }} overcloud host image to other Dev Cloud (Leafcloud/SMS)
+        run: |
+          source venvs/kayobe/bin/activate &&
+          source src/kayobe-config/kayobe-env --environment ci-builder &&
+          kayobe playbook run \
+          src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
+          -e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
+          -e image_name=overcloud-rocky-9-${{ needs.create-tag.outputs.host_image_tag }}
+        env:
+          CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
+          OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
+          OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
+        if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success' && matrix.arch == 'x86_64'
 
       - name: Build an Ubuntu Noble 24.04 ${{ matrix.arch }} overcloud host image
         id: build_ubuntu_noble