Merge branch 'development' into test/feat/pagination-ordering

didx-xyz · Aug 21, 2024 · 6a8f789 · 6a8f789
2 parents f8749a5 + 48eeb56
commit 6a8f789
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/continuous-deploy.yml b/.github/workflows/continuous-deploy.yml
@@ -38,7 +38,6 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-
   build:
     if: ${{ !github.event.pull_request.draft }}
     name: Build GHCR
@@ -51,6 +50,7 @@ jobs:
       image_version: ${{ steps.meta.outputs.version }}
 
     strategy:
+      fail-fast: false
       matrix:
         image:
           [
@@ -72,42 +72,55 @@ jobs:
           - image: governance-ga-agent
             context: .
             file: dockerfiles/agents/Dockerfile.agent
+            platforms: linux/amd64 # Pending BBS linux/arm64
           - image: governance-trust-registry
             context: .
             file: dockerfiles/trustregistry/Dockerfile
+            platforms: linux/amd64,linux/arm64
           - image: governance-multitenant-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
+            platforms: linux/amd64,linux/arm64
           - image: governance-ga-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
+            platforms: linux/amd64,linux/arm64
           - image: governance-tenant-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
+            platforms: linux/amd64,linux/arm64
           - image: governance-public-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
+            platforms: linux/amd64,linux/arm64
           - image: governance-webhooks-web
             context: .
             file: dockerfiles/webhooks/Dockerfile
+            platforms: linux/amd64,linux/arm64
           - image: governance-multitenant-agent
             context: .
             file: dockerfiles/agents/Dockerfile.author.agent
+            platforms: linux/amd64 # Pending BBS linux/arm64
           - image: ledger-browser
             context: https://github.com/bcgov/von-network.git#v1.8.0
             file: Dockerfile
+            platforms: linux/amd64
           - image: ledger-nodes
             context: https://github.com/bcgov/von-network.git#v1.8.0
             file: Dockerfile
+            platforms: linux/amd64
           - image: governance-endorser
             context: .
             file: dockerfiles/endorser/Dockerfile
+            platforms: linux/amd64,linux/arm64
           - image: tails-server
             context: https://github.com/bcgov/indy-tails-server.git#v1.1.0
             file: docker/Dockerfile.tails-server
+            platforms: linux/amd64,linux/arm64
           - image: pytest
             context: .
             file: dockerfiles/tests/Dockerfile
+            platforms: linux/amd64,linux/arm64
 
     steps:
       - name: Check out code
@@ -148,6 +161,7 @@ jobs:
             type=gha,scope=build-${{ matrix.image }}
             type=registry,ref=ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:latest
           cache-to: type=gha,mode=max,scope=build-${{ matrix.image }}
+          platforms: ${{ matrix.platforms }}
 
   lint:
     name: Lint

diff --git a/app/tests/util/webhooks.py b/app/tests/util/webhooks.py
@@ -45,6 +45,7 @@ async def check_webhook_state(
     attempt = 0
 
     while not event and attempt < max_tries:
+        look_back_duration = min(30, look_back + attempt * max_duration)
         try:
             if filter_map:
                 # Assuming that filter_map contains 1 key-value pair
@@ -61,14 +62,14 @@ async def check_webhook_state(
                     field_id=field_id,
                     desired_state=state,
                     timeout=max_duration,
-                    look_back=look_back + attempt * max_duration,  # scale per attempt
+                    look_back=look_back_duration,
                 )
             else:
                 bound_logger.info("Waiting for event with state {}", state)
                 event = await listener.wait_for_state(
                     desired_state=state,
                     timeout=max_duration,
-                    look_back=look_back + attempt * max_duration,  # scale per attempt
+                    look_back=look_back_duration,
                 )
         except SseListenerTimeout:
             bound_logger.error(