From d72e275d0abfdff83271c953a930dcd26ec287a4 Mon Sep 17 00:00:00 2001
From: Mitch <mitchell@aztecprotocol.com>
Date: Thu, 31 Oct 2024 21:29:56 -0400
Subject: [PATCH] disable kind tests on master

---
 .github/workflows/ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c5b83c2a6e..e1cffa2732a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -659,8 +659,7 @@ jobs:
   # note: proving disabled
   kind-network-test:
     needs: [build, configure]
-    # TODO(#9640): remove this once the test is re-enabled on master
-    if: github.ref_name == '9640-re-enable-kind-network-test-on-master'
+    if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master'
     runs-on: ${{ needs.configure.outputs.username }}-x86
     strategy:
       fail-fast: false
@@ -676,7 +675,7 @@ jobs:
       - name: Setup and KIND Network Test
         timeout-minutes: 60
         uses: ./.github/ensure-tester-with-images
-        if: matrix.test == 'smoke.test.ts' || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'network-all')
+        if: contains(github.event.pull_request.labels.*.name, 'kind-network-all')
         env:
           USERNAME: ${{ needs.configure.outputs.username }}
         with: