From b3f0271926e4f7b9d8533927214d2cbe5f9916dd Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Fri, 25 Aug 2023 22:31:29 +0000
Subject: [PATCH] ci: ensure integration tests run to completion

---
 .github/workflows/integration.yml | 16 ++++++++++++++++
 .mergify.yml                      |  1 +
 2 files changed, 17 insertions(+)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 827424f5b367..d351ce46c96a 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -311,3 +311,19 @@ jobs:
         timeout-minutes: 4
         with:
           datadog-token: ${{ secrets.DATADOG_API_KEY }}
+
+  integration-tests-completed:
+    needs:
+      - pre_check
+      - getting-started
+      - deployment-test
+      - test-docker-build
+    if: needs.pre_check.outputs.should_run == 'true' && always()
+    runs-on: ubuntu-latest
+    steps:
+      - shell: bash
+        run: |
+          echo "All integration tests completed"
+          cat <<EOF
+            needs ${{ toJSON(needs) }}
+          EOF
diff --git a/.mergify.yml b/.mergify.yml
index 3c547b0b10f8..30391847a274 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,6 +4,7 @@ queue_rules:
     conditions:
       - base=master
       # Require integration tests before merging only
+      - check-success=integration-tests-completed
       - or:
           - label=bypass:integration
           - check-failure!=Integration tests