Merge remote-tracking branch 'origin/master' into cl/ci3.3

.github/ensure-tester/action.yml

@@ -18,6 +18,7 @@ inputs:
     default: BestEffort
 runs:
   # define an action, runs in OS of caller
+  # ami-052a1e16394277fdf is an ubuntu 22.04.4 jammy
   using: composite
   steps:
     - name: Select Instance Type and AMI

.github/ensure-tester/run

@@ -17,6 +17,12 @@ scripts/run_on_tester "
   }
   export RUN_ID GIT_COMMIT
   export -f clone
+
+  # update fs limits for k8s
+  sudo sysctl -w fs.inotify.max_user_watches=65536
+  sudo sysctl -w fs.inotify.max_user_instances=65536
+  ulimit -n 32768
+
   flock /var/lock/clone.lock bash -c clone
   cd ~/run-$RUN_ID
   # reuse script from ensure-builder, but don't set up chron

.github/workflows/ci.yml

@@ -229,6 +229,7 @@ jobs:
       - name: Test
         timeout-minutes: 40
         run: |
+          until docker info &>/dev/null; do sleep 1; done
           echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
           export CI=1 USE_CACHE=1
           artifact="e2e-${{matrix.test}}-$(./yarn-project/bootstrap.sh hash)"
@@ -239,7 +240,7 @@ jobs:
             ci3/cache_upload_flag "$artifact"
           fi
 
-  # all the benchmarking end-to-end integration tests for aztec (not required to merge)
+  # All the benchmarking end-to-end integration tests for aztec (not required to merge)
   bench-e2e:
     needs: [images-e2e, configure]
     if: needs.configure.outputs.e2e-all == 'true' || needs.configure.outputs.bench-list != '[]'
@@ -254,21 +255,35 @@ jobs:
       - name: Test
         timeout-minutes: 40
         run: |
+          until docker info &>/dev/null; do sleep 1; done
           echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
           export CI=1 USE_CACHE=1
           artifact="bench-${{matrix.test}}-$(./yarn-project/bootstrap.sh hash)"
           if ci3/test_should_run "$artifact"; then
             docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}
             docker pull aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
-            export FORCE_COLOR=1
-            export EARTHLY_BUILD_ARGS="${{ env.EARTHLY_BUILD_ARGS }}"
-            ./yarn-project/end-to-end/scripts/e2e_test.sh ${{ matrix.test }}
-            export COMMIT_HASH=${{ env.GIT_COMMIT }}
-            export PULL_REQUEST=${{ github.event.pull_request.number }}
-            export BRANCH=${{ github.ref_name }}
-            scripts/logs/upload_logs_to_s3.sh /usr/var/log
+            FORCE_COLOR=1 ./yarn-project/end-to-end/scripts/e2e_test.sh ${{ matrix.test }}
             ci3/cache_upload_flag "$artifact"
           fi
+      - name: Inspect data folder
+        continue-on-error: true
+        run: tree ./yarn-project/end-to-end/out
+      - name: Store benchmark result
+        if: github.ref == 'refs/heads/master'
+        continue-on-error: true
+        uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
+        with:
+          name: "End-to-end Benchmark"
+          benchmark-data-dir-path: "dev/e2e-bench"
+          tool: "customSmallerIsBetter"
+          output-file-path: ./yarn-project/end-to-end/out/bench.json
+          github-token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          auto-push: true
+          alert-threshold: "150%"
+          comment-on-alert: true
+          fail-on-alert: false
+          alert-comment-cc-users: "@philwindle @spalladino"
+          max-items-in-chart: 50
 
   # Only e2e test that can't run on standard github runner
   e2e-prover-full:
@@ -313,56 +328,14 @@ jobs:
         with:
           runner_type: 16core-tester-x86
           run: |
+            until docker info &>/dev/null; do sleep 1; done
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
             export CI=1 USE_CACHE=1
             if ci3/test_should_run acir-bench-$(./barretenberg/acir_tests/bootstrap.sh hash); then
               scripts/earthly-ci ./barretenberg/acir_tests+bench-publish
               ci3/cache_upload_flag acir-bench-$(./barretenberg/acir_tests/bootstrap.sh hash)
             fi
 
-  # TODO(ci3) fix and reinstate
-  # bench-summary:
-  #   if: needs.configure.outputs.e2e-all == 'true'
-  #   needs:
-  #     - acir-bench
-  #     - bench-e2e
-  #     - configure
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with:
-  #         fetch-depth: 100 # Downloading base benchmark from master requires access to history
-  #         ref: "${{ github.event.pull_request.head.sha }}"
-  #     - uses: ./.github/ci-setup-action
-  #     - name: "Build and upload bench aggregate file"
-  #       uses: ./.github/ensure-builder
-  #       with:
-  #         runner_type: builder-x86
-  #         username: ${{ needs.configure.outputs.username }}
-  #         run: scripts/earthly-ci ./yarn-project/scripts/+bench-aggregate
-  #     - name: "Download base benchmark and package into earthly"
-  #       if: github.event_name == 'pull_request'
-  #       uses: ./.github/run-on-builder
-  #       env:
-  #         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  #         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  #         BENCH_FOLDER: "./scripts/logs/tmp/bench"
-  #         PULL_REQUEST: "${{ github.event.pull_request.number }}"
-  #       with:
-  #         run: |
-  #           # Download the base benchmark locally (requires AWS creds and .git history)
-  #           mkdir -p $BENCH_FOLDER
-  #           ./scripts/logs/download_base_benchmark_from_s3.sh
-  #           # Package it into an earthly artifact to read from bench-comment
-  #           scripts/earthly-ci ./scripts/logs+pack-base-benchmark
-  #     - name: "Generate summary comment if pull request"
-  #       if: github.event_name == 'pull_request'
-  #       uses: ./.github/run-on-builder
-  #       env:
-  #         AZTEC_BOT_GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
-  #       with:
-  #         run: scripts/earthly-ci ./yarn-project/scripts/+bench-comment
-
   # barretenberg (prover) native, AVM (public VM) and Merkle tree (world state) tests
   # ran on own runner for resource reasons (memory x cpu intensive)
   bb-native-tests:
@@ -377,7 +350,6 @@ jobs:
           mkdir -p ~/.ssh
           echo ${{ secrets.BUILD_INSTANCE_SSH_KEY }} | base64 --decode > ~/.ssh/build_instance_key
           chmod 600 ~/.ssh/build_instance_key
-          echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
       - name: "Native Prover Tests"
         env:
           GITHUB_LOG: 1
@@ -404,11 +376,21 @@ jobs:
           runner_type: 8core-tester-x86
           ttl: 60
           run: |
+            until docker info &>/dev/null; do sleep 1; done
             docker pull aztecprotocol/aztec:${{ env.GIT_COMMIT }}
             docker pull aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
             cd yarn-project/end-to-end
             NAMESPACE=smoke FRESH_INSTALL=true VALUES_FILE=ci-smoke.yaml ./scripts/network_test.sh ./src/spartan/smoke.test.ts
+      - name: Copy Network Logs
+        if: always()
+        run: scripts/copy_from_tester yarn-project/end-to-end/scripts/network-test.log network-test.log || true
+      - name: Upload Network Logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: kind-network-smoke.log
+          path: network-test.log
 
   kind-network-test:
     needs: [images-e2e, configure]
@@ -442,6 +424,7 @@ jobs:
           spot_strategy: None # use on-demand machines
           ttl: ${{ matrix.config.timeout }}
           run: |
+            until docker info &>/dev/null; do sleep 1; done
             export CI=1 USE_CACHE=1
             artifact="kind-network-${{matrix.config.test}}-$(./yarn-project/bootstrap.sh hash)"
             if ci3/test_should_run "$artifact"; then

.github/workflows/nightly-masternet-deploy.yml

@@ -9,13 +9,28 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
+  get-latest-commit:
+    runs-on: ubuntu-latest
+    outputs:
+      commit: ${{ steps.get_commit.outputs.COMMIT }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get latest published commit
+        id: get_commit
+        run: |
+          COMMIT=$(curl -s https://registry.hub.docker.com/v2/repositories/aztecprotocol/aztec/tags/master | jq ".digest" | tr -d '"')
+          echo "COMMIT=$COMMIT" >> $GITHUB_OUTPUT
+
   deploy-network:
+    needs: get-latest-commit
     uses: ./.github/workflows/network-deploy.yml
     with:
       ref: master
       namespace: masternet
       values_file: rc-1.yaml
-      aztec_docker_image: aztecprotocol/aztec:master
+      aztec_docker_image: aztecprotocol/aztec@${{ needs.get-latest-commit.outputs.commit }}
       deployment_mnemonic_secret_name: testnet-deployment-mnemonic
       respect_tf_lock: "false"
       run_terraform_destroy: "true"

.github/workflows/start-spot.yml

@@ -1,20 +1,15 @@
-# Useful if the spot runners are in a bad state
-name: Start/Stop Personal Spot
+# Useful if the publish npm runner is in a bad state
+name: Start Legacy Runner
 on:
   workflow_dispatch:
     inputs:
       username:
         description: 'Username (optional)'
-        required: false
-      action:
-        description: "Defaults to 'start', can be 'stop', 'restart'"
-        required: false
-        default: 'start'
+        required: true
 jobs:
   start-build:
     uses: ./.github/workflows/setup-runner.yml
     with:
-      username: ${{ inputs.username || github.actor }}
+      username: ${{ inputs.username }}
       runner_type: builder-x86
-      runner_action: ${{ inputs.action }}
-    secrets: inherit
+    secrets: inherit

.noir-sync-commit

@@ -1 +1 @@
-db28cb9ffb710c286b54dbfcf57292ae3dffb03d
+c172880ae47ec4906cda662801bd4b7866c9586b

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
-  ".": "0.69.1",
+  ".": "0.71.0",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.69.1",
-  "barretenberg": "0.69.1",
-  "barretenberg/ts": "0.69.1"
+  "yarn-project/aztec": "0.71.0",
+  "barretenberg": "0.71.0",
+  "barretenberg/ts": "0.71.0"
 }