From 3ca26744d38e28bdeb1e9927e543a7c62f4e2e4a Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Mon, 17 Feb 2025 16:40:37 +0000
Subject: [PATCH] First upload artifacts and then run tests to make sure we can
 easily debug broken images (#2214)

---
 .github/workflows/docker-build-test-upload.yml |  8 ++++----
 .github/workflows/docker.yml                   | 12 ++----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml
index 9d86136f..a0c82f6d 100644
--- a/.github/workflows/docker-build-test-upload.yml
+++ b/.github/workflows/docker-build-test-upload.yml
@@ -78,10 +78,6 @@ jobs:
           BUILDKIT_PROGRESS: plain
         shell: bash
 
-      - name: Run tests ✅
-        run: python3 -m tests.run_tests --short-image-name ${{ inputs.image }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
-        shell: bash
-
       - name: Write tags file 🏷
         run: |
           python3 -m tagging.write_tags_file --short-image-name ${{ inputs.image }} --tags-dir /tmp/jupyter/tags/ --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }} --variant ${{ inputs.variant }}
@@ -120,3 +116,7 @@ jobs:
           name: ${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}
           path: /tmp/jupyter/images/${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}.tar.zst
           retention-days: 3
+
+      - name: Run tests ✅
+        run: python3 -m tests.run_tests --short-image-name ${{ inputs.image }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
+        shell: bash
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1b3ac290..91edf2b7 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -458,11 +458,7 @@ jobs:
             { image: all-spark-notebook, variant: default },
           ]
     needs: [aarch64-images-tag-push, x86_64-images-tag-push]
-    if: |
-      always() &&
-      needs.x86_64-images-tag-push.result == 'success' &&
-      (needs.aarch64-images-tag-push.result == 'success' || needs.aarch64-images-tag-push.result == 'skipped') &&
-      !contains(github.event.pull_request.title, '[FAST_BUILD]')
+    if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && !contains(github.event.pull_request.title, '[FAST_BUILD]')
 
   merge-tags-fast:
     uses: ./.github/workflows/docker-merge-tags.yml
@@ -480,11 +476,7 @@ jobs:
             { image: base-notebook, variant: default },
           ]
     needs: [aarch64-images-tag-push-fast, x86_64-images-tag-push-fast]
-    if: |
-      always() &&
-      needs.x86_64-images-tag-push-fast.result == 'success' &&
-      (needs.aarch64-images-tag-push-fast.result == 'success' || needs.aarch64-images-tag-push-fast.result == 'skipped') &&
-      contains(github.event.pull_request.title, '[FAST_BUILD]')
+    if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && contains(github.event.pull_request.title, '[FAST_BUILD]')
 
   wiki-update:
     uses: ./.github/workflows/docker-wiki-update.yml