fix

Author: Alex-Welsh

.github/workflows/update-dependencies.yml

@@ -41,9 +41,15 @@ jobs:
           ref: ${{ inputs.openstack_version }}
           path: src/kayobe-config
 
+      - name: Set sanitized branch name
+        id: branch_name
+        run: |
+          sanitized_name=$(echo "update-dependencies/${{ inputs.openstack_version }}" | tr '/' '-')
+          echo "name=${sanitized_name}" >> $GITHUB_OUTPUT
+
       - name: Set up branch and Git config
         run: |
-          git checkout -b update-dependencies/${{ inputs.openstack_version }}
+          git checkout -b ${{ steps.branch_name.outputs.name }}
           git config user.name "stackhpc-ci"
           git config user.email "[email protected]"
         working-directory: src/kayobe-config
@@ -54,6 +60,7 @@ jobs:
           echo "" >> pr_body.md
           echo "### Changes" >> pr_body.md
 
+      # --- 1. Kolla ---
       - name: Checkout Kolla repository
         uses: actions/checkout@v4
         with:
@@ -70,9 +77,14 @@ jobs:
       - name: Get current Kolla version
         id: current_kolla_version
         run: |
-          VERSION=$(grep 'stackhpc_kolla_source_version:' src/kayobe-config/etc/kayobe/stackhpc.yml | sed 's/.*: //')
+          VERSION=$(awk -F': ' '/stackhpc_kolla_source_version:/ {print $2}' src/kayobe-config/etc/kayobe/stackhpc.yml | xargs)
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Debug Kolla version comparison
+        run: |
+          echo "Latest Tag: '${{ steps.latest_kolla_tag.outputs.latest_tag }}'"
+          echo "Current Version: '${{ steps.current_kolla_version.outputs.version }}'"
+
       - name: Update and commit Kolla version if needed
         if: steps.latest_kolla_tag.outputs.latest_tag != steps.current_kolla_version.outputs.version
         run: |
@@ -85,6 +97,7 @@ jobs:
           TAG: ${{ steps.latest_kolla_tag.outputs.latest_tag }}
         working-directory: src/kayobe-config
 
+      # --- 2. Kolla Ansible ---
       - name: Checkout Kolla Ansible repository
         uses: actions/checkout@v4
         with:
@@ -101,9 +114,14 @@ jobs:
       - name: Get current Kolla Ansible version
         id: current_kolla_ansible_version
         run: |
-          VERSION=$(grep 'stackhpc_kolla_ansible_source_version:' src/kayobe-config/etc/kayobe/stackhpc.yml | sed 's/.*: //')
+          VERSION=$(awk -F': ' '/stackhpc_kolla_ansible_source_version:/ {print $2}' src/kayobe-config/etc/kayobe/stackhpc.yml | xargs)
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Debug Kolla Ansible version comparison
+        run: |
+          echo "Latest Tag: '${{ steps.latest_kolla_ansible_tag.outputs.latest_tag }}'"
+          echo "Current Version: '${{ steps.current_kolla_ansible_version.outputs.version }}'"
+
       - name: Update and commit Kolla Ansible version if needed
         if: steps.latest_kolla_ansible_tag.outputs.latest_tag != steps.current_kolla_ansible_version.outputs.version
         run: |
@@ -116,6 +134,7 @@ jobs:
           TAG: ${{ steps.latest_kolla_ansible_tag.outputs.latest_tag }}
         working-directory: src/kayobe-config
 
+      # --- 3. Kayobe ---
       - name: Checkout Kayobe repository
         uses: actions/checkout@v4
         with:
@@ -132,9 +151,14 @@ jobs:
       - name: Get current Kayobe version
         id: current_kayobe_version
         run: |
-          VERSION=$(grep 'kayobe@stackhpc/' src/kayobe-config/requirements.txt | sed 's/.*@//')
+          VERSION=$(grep 'kayobe@stackhpc/' src/kayobe-config/requirements.txt | sed 's/.*@//' | xargs)
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Debug Kayobe version comparison
+        run: |
+          echo "Latest Tag: '${{ steps.latest_kayobe_tag.outputs.latest_tag }}'"
+          echo "Current Version: '${{ steps.current_kayobe_version.outputs.version }}'"
+
       - name: Update and commit Kayobe version if needed
         if: steps.latest_kayobe_tag.outputs.latest_tag != steps.current_kayobe_version.outputs.version
         run: |
@@ -147,15 +171,38 @@ jobs:
           TAG: ${{ steps.latest_kayobe_tag.outputs.latest_tag }}
         working-directory: src/kayobe-config
 
+      # --- 4. Push and Create Pull Request ---
+      - name: Check for new commits
+        id: check_commits
+        run: |
+          echo "--- Git Log ---"
+          git log --oneline --graph --all
+          echo "---------------"
+          count=$(git rev-list --count ${{ inputs.openstack_version }}..HEAD)
+          echo "Commit count between ${{ inputs.openstack_version }} and HEAD is: $count"
+          if [ "$count" -gt 0 ]; then
+            echo "has_commits=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_commits=false" >> $GITHUB_OUTPUT
+          fi
+        working-directory: src/kayobe-config
+
+      - name: Push commits
+        if: steps.check_commits.outputs.has_commits == 'true'
+        run: git push --force origin ${{ steps.branch_name.outputs.name }}
+        working-directory: src/kayobe-config
+
       - name: Propose changes via PR if required
-        id: cpr
+        if: steps.check_commits.outputs.has_commits == 'true'
         uses: peter-evans/create-pull-request@v7
         with:
           path: src/kayobe-config
-          branch: update-dependencies/${{ inputs.openstack_version }}
+          branch: ${{ steps.branch_name.outputs.name }}
+          base: ${{ inputs.openstack_version }}
           delete-branch: true
           title: "chore(deps): Bump dependencies for OpenStack ${{ inputs.openstack_codename }}"
           body-path: pr_body.md
           labels: |
             automated
             ${{ inputs.openstack_codename }}
+