From 8b5eb63627c9104fe9530339dd0385046b0279d4 Mon Sep 17 00:00:00 2001
From: Eoin O'Shaughnessy <e.oshaughnessy@f5.com>
Date: Wed, 19 Jun 2024 10:28:18 +0100
Subject: [PATCH] change results order to allow auto-merge

---
 .github/workflows/ci.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe123a6931..1a71460a67 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -733,23 +733,9 @@ jobs:
           path: ${{ github.workspace }}/tests/${{ steps.smoke-tests.outputs.test-results-name }}-${{ matrix.k8s }}.html
         if: always()
 
-  smoke-results:
-    if: ${{ always() }}
-    runs-on: ubuntu-22.04
-    name: Final Smoke Test Results
-    needs: [smoke-tests]
-    steps:
-      - run: |
-          result="${{ needs.smoke-tests.result }}"
-          if [[ $result == "success" || $result == "skipped" ]]; then
-            exit 0
-          else
-            exit 1
-          fi
-
   tag-stable:
     name: Tag tested image as stable
-    needs: [checks, smoke-results]
+    needs: [checks, smoke-tests]
     permissions:
       contents: read # To checkout repository
       id-token: write # To sign into Google Container Registry
@@ -759,7 +745,21 @@ jobs:
       target_tag: ${{ needs.checks.outputs.stable_tag }}
       dry_run: false
     secrets: inherit
-    if: ${{ inputs.force || (needs.checks.outputs.forked_workflow == 'false' && needs.smoke-results.result == 'success' && needs.checks.outputs.stable_image_exists != 'true' && needs.checks.outputs.docs_only == 'false') }}
+    if: ${{ inputs.force || (needs.checks.outputs.forked_workflow == 'false' && needs.checks.outputs.stable_image_exists != 'true' && needs.checks.outputs.docs_only == 'false') }}
+
+  tag-results:
+    if: ${{ always() }}
+    runs-on: ubuntu-22.04
+    name: Final CI Results
+    needs: [tag-stable]
+    steps:
+      - run: |
+          result="${{ needs.tag-stable.result }}"
+          if [[ $result == "success" || $result == "skipped" ]]; then
+            exit 0
+          else
+            exit 1
+          fi
 
   trigger-image-promotion:
     name: Promote images on Force Run
@@ -767,7 +767,7 @@ jobs:
       - build-docker
       - build-docker-plus
       - build-docker-nap
-      - smoke-results
+      - tag-results
     permissions:
       contents: write # for pushing to Helm Charts repository
       id-token: write # To sign into Google Container Registry