From 2d92a474acae7609ef12188268ae2c16f79d72c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 8 Feb 2024 11:56:39 +0100
Subject: [PATCH] Update e2e common debug script WIP

---
 .github/workflows/e2e-common-debug.yml | 29 +++++++++++++++++---------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/e2e-common-debug.yml b/.github/workflows/e2e-common-debug.yml
index ab22d985..7e31ca8d 100644
--- a/.github/workflows/e2e-common-debug.yml
+++ b/.github/workflows/e2e-common-debug.yml
@@ -28,7 +28,6 @@ jobs:
     runs-on: [self-hosted, v3]
     outputs:
       image: ${{ steps.export.outputs.IMAGE }}
-      promoted_image: ${{ steps.export.outputs.PROMOTED_IMAGE }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -59,11 +58,9 @@ jobs:
               echo "Export $CIUX_IMAGE_URL to archive"
               docker save "$CIUX_IMAGE_URL" > artifacts/image.tar
             fi
-            echo "PROMOTED_IMAGE=''" >> "$GITHUB_OUTPUT"
           else
             echo "Using existing image $CIUX_IMAGE_URL"
             touch artifacts/empty
-            echo "PROMOTED_IMAGE=$CIUX_IMAGE_REGISTRY/$CIUX_IMAGE_NAME/$FINKCTL_VERSION" >> "$GITHUB_OUTPUT"
           fi
           echo "IMAGE=$CIUX_IMAGE_URL" >> "$GITHUB_OUTPUT"
       - uses: actions/upload-artifact@v2
@@ -73,6 +70,9 @@ jobs:
   integration-tests:
     name: Run integration tests
     runs-on: [self-hosted, v3]
+    outputs:
+      new_image: ${{ steps.promote.outputs.NEW_IMAGE }}
+      promoted_image: ${{ steps.promote.outputs.PROMOTED_IMAGE }}
     needs: build
     steps:
       - name: Checkout code
@@ -134,6 +134,12 @@ jobs:
       - name: Check results
         run: |
           ./e2e/check-results.sh
+      - name: Promote fink-broker image
+        id: promote
+        run: |
+          . "$CIUXCONFIG"
+          echo "PROMOTED_IMAGE=$CIUX_IMAGE_REGISTRY/$CIUX_IMAGE_NAME/$FINKCTL_VERSION" >> "$GITHUB_OUTPUT"
+          echo "NEW_IMAGE=$CIUX_BUILD" >> "$GITHUB_OUTPUT"
   image-analysis:
     name: Analyze image
     runs-on: [self-hosted, v3]
@@ -193,17 +199,20 @@ jobs:
           registry: gitlab-registry.in2p3.fr
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Push image to IN2P3 registry
+      - name: Push image to official registry
         run: |
           IMAGE="${{ needs.build.outputs.image }}"
-          PROMOTED_IMAGE="${{ needs.build.outputs.promoted_image }}"
-          if [ -n "$PROMOTED_IMAGE" ]; then
-            sudo apt-get install -y skopeo
-            echo "Adding image tag $PROMOTED_IMAGE to $IMAGE"
-            skopeo copy docker://$IMAGE docker://$PROMOTED_IMAGE
-          else
+          NEW_IMAGE="${{ needs.integration-tests.outputs.new_image }}"
+          PROMOTED_IMAGE="${{ needs.integration-tests.outputs.promoted_image }}"
+          if [ $NEW_IMAGE = true ]; then
             echo "Push image $IMAGE"
+            docker tag "$IMAGE" "$PROMOTED_IMAGE"
             docker push "${{ needs.build.outputs.image }}"
+          else
+            sudo apt-get update -y
+            sudo apt-get install -y skopeo
+            echo "Add image tag $PROMOTED_IMAGE to $IMAGE"
+            skopeo copy docker://$IMAGE docker://$PROMOTED_IMAGE
           fi