PR WIP

Author: MoteHue

.github/workflows/amphora-image-build.yml

@@ -29,13 +29,13 @@ 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 }}/" etc/kayobe/pulp-host-image-versions.yml
-        if: "${{ github.event.inputs.rocky9_tag != '' }}"
+          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 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 }}/" etc/kayobe/pulp-host-image-versions.yml
-        if: "${{ github.event.inputs.ubuntu_noble_tag != '' }}"
+          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
         uses: peter-evans/create-pull-request@v7
@@ -44,14 +44,14 @@ jobs:
           commit-message: >-
             Bump overcloud host image tags
           author: stackhpc-ci <[email protected]>
-          branch: bump-overcloud-host-images/${{ inputs.rocky9_tag }}/${{ inputs.ubuntu_noble_tag }}
+          branch: bump-overcloud-host-images-${{ inputs.rocky9_tag }}-${{ inputs.ubuntu_noble_tag }}
           delete-branch: true
           title: >-
             DNM test PR: Bump overcloud host image tags 
-          body: >
+          body: |
             This PR was created automatically to update the overcloud host image
-            tags to:
-            Rocky 9: ${{ inputs.rocky9_tag }}
-            Ubuntu Noble: ${{ inputs.ubuntu_noble_tag }}
+            tags.
+            Rocky 9: ${{ inputs.rocky9_tag != '' ? inputs.rocky9_tag : 'N/A' }}
+            Ubuntu Noble: ${{ inputs.ubuntu_noble_tag != '' ? inputs.ubuntu_noble_tag : 'N/A' }}
           labels: |
             automated