Correct proposing PR automatically

Author: MoteHue

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

@@ -44,7 +44,7 @@ jobs:
     runs-on: ${{ needs.runner-selection.outputs.runner_name_image_build }}
     needs:
       - runner-selection
-    permissions: {}
+    permissions: write-all
     steps:
       - name: Validate inputs
         run: |
@@ -56,7 +56,7 @@ jobs:
       - name: Install Package
         uses: ConorMacBride/install-package@main
         with:
-          apt: git unzip nodejs python3-pip python3-venv openssh-server openssh-client jq
+          apt: git unzip nodejs python3-pip python3-venv openssh-server openssh-client jq gh
 
       - name: Start the SSH service
         run: |
@@ -397,10 +397,10 @@ jobs:
           update-overcloud-host-image-tags.yml \
           --repo stackhpc/stackhpc-kayobe-config \
           --ref $BRANCH_NAME \
-          -f rocky9_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-          -f ubuntu_noble_tag=${{ steps.host_image_tag.outputs.host_image_tag }}
+          $(if [[ "${{ inputs.rocky9 }}" == "true" ]]; then echo "-f rocky9_tag=${{ steps.host_image_tag.outputs.host_image_tag }}"; fi) \
+          $(if [[ "${{ inputs.ubuntu-noble }}" == "true" ]]; then echo "-f ubuntu_noble_tag=${{ steps.host_image_tag.outputs.host_image_tag }}"; fi)
         env:
-          GITHUB_TOKEN: ${{ secrets.STACKHPC_RELEASE_TRAIN_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
       - name: Display link to update overcloud host image tags workflows

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

@@ -1,16 +1,15 @@
+---
 name: Update overcloud host image tags
 
 on:
-  workflow_call:
+  workflow_dispatch:
     inputs:
       rocky9_tag:
         description: Overcloud host image tag for Rocky 9
         type: string
-        required: true
       ubuntu_noble_tag:
         description: Overcloud host image tag for Ubuntu
         type: string
-        required: true
 
 jobs:
   propose_overcloud_host_image_tag_updates:
@@ -27,10 +26,15 @@ jobs:
           ref: stackhpc/2025.1
           path: ${{ github.workspace }}/src/kayobe-config
 
-      - name: Update overcloud host image tags
+      - 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
-          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
+          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 }}/" ${{ 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
@@ -39,13 +43,13 @@ jobs:
           commit-message: >-
             Bump overcloud host image tags
           author: stackhpc-ci <[email protected]>
-          branch: bump-overcloud-host-images/${{ inputs.rocky9_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:
+            tags.
             Rocky 9: ${{ inputs.rocky9_tag }}
             Ubuntu Noble: ${{ inputs.ubuntu_noble_tag }}
           labels: |