Skip to content

Commit 3ca2674

Browse files
authored
First upload artifacts and then run tests to make sure we can easily debug broken images (#2214)
1 parent c6ba9e1 commit 3ca2674

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

.github/workflows/docker-build-test-upload.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ jobs:
7878
BUILDKIT_PROGRESS: plain
7979
shell: bash
8080

81-
- name: Run tests ✅
82-
run: python3 -m tests.run_tests --short-image-name ${{ inputs.image }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
83-
shell: bash
84-
8581
- name: Write tags file 🏷
8682
run: |
8783
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:
120116
name: ${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}
121117
path: /tmp/jupyter/images/${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}.tar.zst
122118
retention-days: 3
119+
120+
- name: Run tests ✅
121+
run: python3 -m tests.run_tests --short-image-name ${{ inputs.image }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
122+
shell: bash

.github/workflows/docker.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,7 @@ jobs:
458458
{ image: all-spark-notebook, variant: default },
459459
]
460460
needs: [aarch64-images-tag-push, x86_64-images-tag-push]
461-
if: |
462-
always() &&
463-
needs.x86_64-images-tag-push.result == 'success' &&
464-
(needs.aarch64-images-tag-push.result == 'success' || needs.aarch64-images-tag-push.result == 'skipped') &&
465-
!contains(github.event.pull_request.title, '[FAST_BUILD]')
461+
if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && !contains(github.event.pull_request.title, '[FAST_BUILD]')
466462

467463
merge-tags-fast:
468464
uses: ./.github/workflows/docker-merge-tags.yml
@@ -480,11 +476,7 @@ jobs:
480476
{ image: base-notebook, variant: default },
481477
]
482478
needs: [aarch64-images-tag-push-fast, x86_64-images-tag-push-fast]
483-
if: |
484-
always() &&
485-
needs.x86_64-images-tag-push-fast.result == 'success' &&
486-
(needs.aarch64-images-tag-push-fast.result == 'success' || needs.aarch64-images-tag-push-fast.result == 'skipped') &&
487-
contains(github.event.pull_request.title, '[FAST_BUILD]')
479+
if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && contains(github.event.pull_request.title, '[FAST_BUILD]')
488480

489481
wiki-update:
490482
uses: ./.github/workflows/docker-wiki-update.yml

0 commit comments

Comments
 (0)