From 10357db50d22de7e6621c439d4a92cd147e4779e Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Mon, 15 Apr 2024 11:01:27 +0000
Subject: [PATCH 1/2] Temporarily disable the bench tests

---
 .circleci/config.yml | 76 ++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index debe97a230e4..6e4edfec8142 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -759,35 +759,35 @@ jobs:
           aztec_manifest_key: end-to-end
     <<: *defaults_e2e_test
 
-  bench-publish-rollup:
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Benchmark"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_publish_rollup.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
-          aztec_manifest_key: end-to-end
-    <<: *defaults_e2e_test
-
-  bench-process-history:
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Benchmark"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_process_history.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
-          aztec_manifest_key: end-to-end
-    <<: *defaults_e2e_test
-
-  bench-tx-size:
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Benchmark"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_tx_size_fees.test.ts ENABLE_GAS=1 DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
-          aztec_manifest_key: end-to-end
-    <<: *defaults_e2e_test
+  # bench-publish-rollup:
+  #   steps:
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Benchmark"
+  #         command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_publish_rollup.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
+  #         aztec_manifest_key: end-to-end
+  #   <<: *defaults_e2e_test
+
+  # bench-process-history:
+  #   steps:
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Benchmark"
+  #         command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_process_history.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
+  #         aztec_manifest_key: end-to-end
+  #   <<: *defaults_e2e_test
+
+  # bench-tx-size:
+  #   steps:
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Benchmark"
+  #         command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_tx_size_fees.test.ts ENABLE_GAS=1 DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
+  #         aztec_manifest_key: end-to-end
+  #   <<: *defaults_e2e_test
 
   build-docs:
     machine:
@@ -837,15 +837,15 @@ jobs:
           name: "Noop"
           command: echo Noop
 
-  bench-summary:
-    machine:
-      image: default
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Assemble benchmark summary from uploaded logs"
-          command: ./scripts/ci/assemble_e2e_benchmark.sh
+  # bench-summary:
+  #   machine:
+  #     image: default
+  #   steps:
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Assemble benchmark summary from uploaded logs"
+  #         command: ./scripts/ci/assemble_e2e_benchmark.sh
 
   # Deploy & release jobs.
   deploy-and-release:

From 00f8f02443922c825efaea1da04fd2caed871e5a Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Mon, 15 Apr 2024 11:03:18 +0000
Subject: [PATCH 2/2] Fix config

---
 .circleci/config.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6e4edfec8142..be6f871400d2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1184,15 +1184,15 @@ workflows:
           <<: *defaults
 
       # Benchmark jobs.
-      - bench-publish-rollup: *e2e_test
-      - bench-process-history: *e2e_test
-      - bench-tx-size: *e2e_test
-      - bench-summary:
-          requires:
-            - bench-publish-rollup
-            - bench-process-history
-            - bench-tx-size
-          <<: *defaults
+      # - bench-publish-rollup: *e2e_test
+      # - bench-process-history: *e2e_test
+      # - bench-tx-size: *e2e_test
+      # - bench-summary:
+      #     requires:
+      #       - bench-publish-rollup
+      #       - bench-process-history
+      #       - bench-tx-size
+      #     <<: *defaults
 
       # Production releases.
       - deploy-and-release: *defaults_deploy