testo

Author: stackhpc-ci

.github/workflows/update-dependencies.yml

@@ -80,11 +80,6 @@ jobs:
           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: |
@@ -117,11 +112,6 @@ jobs:
           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: |
@@ -154,11 +144,6 @@ jobs:
           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: |
@@ -175,29 +160,36 @@ jobs:
       - 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: Propose changes via PR if required
+      - name: Push commits
         if: steps.check_commits.outputs.has_commits == 'true'
-        uses: peter-evans/create-pull-request@v7
-        with:
-          path: src/kayobe-config
-          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 }}
+        run: git push --force origin ${{ steps.branch_name.outputs.name }}
+        working-directory: src/kayobe-config
+
+      - name: Create or Update Pull Request
+        if: steps.check_commits.outputs.has_commits == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: src/kayobe-config
+        run: |
+          EXISTING_PR=$(gh pr list --head "${{ steps.branch_name.outputs.name }}" --json number -q '.[0].number')
+          if [ -n "$EXISTING_PR" ]; then
+            echo "Pull request #${EXISTING_PR} already exists. Closing it before creating a new one."
+            gh pr close $EXISTING_PR
+          fi
+          echo "Creating new pull request."
+          gh pr create \
+            --base "${{ inputs.openstack_version }}" \
+            --head "${{ steps.branch_name.outputs.name }}" \
+            --title "chore(deps): Bump dependencies for OpenStack ${{ inputs.openstack_codename }}" \
+            --body-file ../../pr_body.md \
+            --label "automated" \
+            --label "${{ inputs.openstack_codename }}"