fix new timeouts (#5708)

.github/workflows/ci-arm.yml

@@ -30,7 +30,6 @@ jobs:
   build:
     needs: setup
     runs-on: master-arm
-    timeout-minutes: 40
     steps:
       - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
       - uses: ./.github/ci-setup-action
@@ -40,13 +39,14 @@ jobs:
           # must be globally unique for build x runner
           concurrency_key: build-master-arm
       # prepare images locally, tagged by commit hash
-      - run: earthly ./yarn-project+export-end-to-end
+      - name: "Build E2E Image"
+        timeout-minutes: 40
+        run: earthly ./yarn-project+export-end-to-end
 
   # all the end-to-end integration tests for aztec
   e2e:
     needs: build
     runs-on: master-arm
-    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
@@ -60,11 +60,7 @@ jobs:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_token: "${{ secrets.AZTEC_GITHUB_TOKEN }}"
           concurrency_key: e2e-master-arm
-      # Ensure that a test only ever is running one e2e at a time
-      - name: Set up mutex
-        uses: ben-z/[email protected]
-        with:
-          branch: gh-action-mutex-e2e-arm-master-${{ matrix.test }}
       - name: Test
         working-directory: ./yarn-project/end-to-end/
+        timeout-minutes: 15
         run: earthly -P --no-output +${{ matrix.test }} --e2e_mode=cache

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
   build:
     needs: setup
     runs-on: ${{ github.actor }}-x86
-    timeout-minutes: 40
+    if: ${{ github.event.inputs.just_start_spot != 'true' }}
     outputs:
       e2e_list: ${{ steps.e2e_list.outputs.list }}
     steps:
@@ -43,7 +43,9 @@ jobs:
           # must be globally unique for build x runner
           concurrency_key: build-${{ github.actor }}-x86
       # prepare images locally, tagged by commit hash
-      - run: earthly ./yarn-project+export-end-to-end
+      - name: "Build E2E Image"
+        timeout-minutes: 40
+        run: earthly ./yarn-project+export-end-to-end
       # We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end
       # (Note ARM uses just 2 tests as a smoketest)
       - name: Create list of end-to-end jobs
@@ -54,7 +56,6 @@ jobs:
   e2e:
     needs: build
     runs-on: ${{ github.actor }}-x86
-    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
@@ -69,6 +70,7 @@ jobs:
           concurrency_key: e2e-${{ github.actor }}-x86-${{ matrix.test }}
       - name: Test
         working-directory: ./yarn-project/end-to-end/
+        timeout-minutes: 15
         run: earthly -P --no-output +${{ matrix.test }} --e2e_mode=cache
       # TODO
       # - name: Upload logs
@@ -79,7 +81,6 @@ jobs:
   bb-native-tests:
     needs: setup
     runs-on: ${{ github.actor }}-x86
-    timeout-minutes: 15
     strategy:
       fail-fast: false
     steps:
@@ -91,14 +92,15 @@ jobs:
           concurrency_token: "${{ secrets.AZTEC_GITHUB_TOKEN }}"
           # must be globally unique for build x runner
           concurrency_key: bb-native-tests-${{ github.actor }}-x86
-      - working-directory: ./barretenberg/cpp/
+      - name: "Native Prover Tests"
+        working-directory: ./barretenberg/cpp/
+        timeout-minutes: 15
         run: earthly --no-output +test
 
   # push benchmarking binaries to dockerhub registry
   bb-bench-binaries:
     needs: setup
     runs-on: ${{ github.actor }}-x86
-    timeout-minutes: 15
     steps:
       - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
       - uses: ./.github/ci-setup-action
@@ -109,6 +111,7 @@ jobs:
           concurrency_key: bb-bench-binaries-${{ github.actor }}-x86
       - name: Build and Push Binaries
         if: ${{ github.event.inputs.just_start_spot != 'true' }}
+        timeout-minutes: 15
         working-directory: ./barretenberg/cpp/
         run: earthly --push +bench-binaries
 
@@ -127,7 +130,6 @@ jobs:
   bb-bench:
     runs-on: ${{ github.actor }}-bench-x86
     needs: setup-bench
-    timeout-minutes: 15
     steps:
       - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
       - uses: ./.github/ci-setup-action
@@ -140,10 +142,12 @@ jobs:
       # Use bench_mode=cache to read the pushed build above
       - name: Client IVC Bench
         working-directory: ./barretenberg/cpp/
+        timeout-minutes: 15
         run: earthly --no-output +bench-client-ivc --bench_mode=cache
 
       - name: Ultrahonk Bench
         working-directory: ./barretenberg/cpp/
+        timeout-minutes: 15
         run: earthly --no-output +bench-ulAtra-honk --bench_mode=cache
 
   # # Post actions, deploy and summarize logs