Add waits for all docker images to update argocd_metadata (#1202)

* Remove unnecessary waits to update argocd_metadata * Annotate important value not to be changed Reintroduce waits * Only checkout if success to reduce race condition probability * Add waits for each docker image we build * Avoid race condition in updating of argocd metadata repo As @theosanderson said: Your race condition point is a good reason to use concurrency, but without cancel-in-progress
loculus-project · Feb 29, 2024 · b64039a · b64039a
1 parent 290b40c
commit b64039a
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 5 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -33,7 +33,7 @@ jobs:
           build-root-directory: ./backend
 
   dockerImage:
-    name: Build Backend Docker Image
+    name: Build Backend Docker Image # Don't change: Referenced by .github/workflows/update-argocd-metadata.yml
     runs-on: ubuntu-latest
     permissions:
       packages: write

diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   dockerImage:
-    name: Build config-processor Docker Image
+    name: Build config-processor Docker Image # Don't change: Referenced by .github/workflows/update-argocd-metadata.yml
     runs-on: ubuntu-latest
     permissions:
       contents: read

diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml
@@ -13,6 +13,7 @@ concurrency:
 
 jobs:
   build-or-use-cache:
+    name: Preprocessing dummy docker image build # Don't change: Referenced by .github/workflows/update-argocd-metadata.yml
     runs-on: ubuntu-latest
     permissions:
       contents: read

diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   dockerImage:
-    name: Build keycloakify Docker Image
+    name: Build keycloakify Docker Image # Don't change: Referenced by .github/workflows/update-argocd-metadata.yml
     runs-on: ubuntu-latest
     permissions:
       contents: read

diff --git a/.github/workflows/preprocessing-nextclade.yaml b/.github/workflows/preprocessing-nextclade.yaml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   dockerImage:
-    name: Build preprocessing-nextclade Docker Image
+    name: Build preprocessing-nextclade Docker Image # Don't change: Referenced by .github/workflows/update-argocd-metadata.yml
     runs-on: ubuntu-latest
     permissions:
       contents: read

diff --git a/.github/workflows/update-argocd-metadata.yml b/.github/workflows/update-argocd-metadata.yml
@@ -6,6 +6,9 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: ci-update-argocd-metadata
+
 jobs:
   update:
     permissions:
@@ -19,24 +22,59 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
+
       - name: Get SHA - length 7
         id: get_sha
         run: |
           echo "sha=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT
 
+      - name: Wait for Prepro Dummy Docker Image
+        uses: lewagon/wait-on-check-action@v1.3.3
+        with:
+          ref: ${{ github.sha }}
+          check-name: Preprocessing dummy docker image build
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 2
+
+      - name: Wait for Config Processor Docker Image
+        uses: lewagon/wait-on-check-action@v1.3.3
+        with:
+          ref: ${{ github.sha }}
+          check-name: Build config-processor Docker Image
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 2
+
       - name: Wait for Backend Docker Image
         uses: lewagon/wait-on-check-action@v1.3.3
         with:
           ref: ${{ github.sha }}
           check-name: Build Backend Docker Image
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 2
 
       - name: Wait for Website Docker Image
         uses: lewagon/wait-on-check-action@v1.3.3
         with:
           ref: ${{ github.sha }}
           check-name: Build Website Docker Image
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 2
+
+      - name: Wait for Prepro Nextclade Docker Image
+        uses: lewagon/wait-on-check-action@v1.3.3
+        with:
+          ref: ${{ github.sha }}
+          check-name: Build preprocessing-nextclade Docker Image
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 2
+
+      - name: Wait for Keycloakify Docker Image
+        uses: lewagon/wait-on-check-action@v1.3.3
+        with:
+          ref: ${{ github.sha }}
+          check-name: Build keycloakify Docker Image
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 2
 
       - name: Checkout External Repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -54,7 +54,7 @@ jobs:
         run: npm run test
 
   dockerImage:
-    name: Build Website Docker Image
+    name: Build Website Docker Image # Don't change: Referenced by .github/workflows/update-argocd-metadata.yml
     runs-on: ubuntu-latest
     permissions:
       contents: read