From 975e87948cc45ba1d3088849e88eb97c4993d839 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 17:28:29 -0400
Subject: [PATCH 1/9] fix: run e2e tests without spot

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73db5c20bda..ce327986fb3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -733,7 +733,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end e2e_sandbox_example.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_sandbox_example.test.ts docker-compose-e2e-sandbox.yml
 
   e2e-multi-transfer-contract:
     docker:
@@ -744,7 +744,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end e2e_multi_transfer.test.ts
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_multi_transfer.test.ts
 
   e2e-block-building:
     machine:
@@ -839,7 +839,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end e2e_escrow_contract.test.ts
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_escrow_contract.test.ts
 
   e2e-pending-commitments-contract:
     machine:
@@ -934,7 +934,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end e2e_p2p_network.test.ts
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_p2p_network.test.ts
 
   e2e-browser-sandbox:
     docker:
@@ -945,7 +945,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end e2e_aztec_js_browser.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_aztec_js_browser.test.ts docker-compose-e2e-sandbox.yml
 
   aztec-rpc-sandbox:
     docker:
@@ -956,7 +956,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end aztec_rpc_sandbox.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local aztec_rpc_sandbox.test.ts docker-compose-e2e-sandbox.yml
 
   guides-writing-an-account-contract:
     machine:
@@ -979,7 +979,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests end-to-end guides/dapp_testing.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts docker-compose-e2e-sandbox.yml
 
   e2e-canary-test:
     docker:

From b1ca943be01d90d89e96391d4d0f0515a282f986 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 17:30:31 -0400
Subject: [PATCH 2/9] Run end-to-end

---
 yarn-project/end-to-end/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/end-to-end/README.md b/yarn-project/end-to-end/README.md
index 586af171de2..5af11b9a5bc 100644
--- a/yarn-project/end-to-end/README.md
+++ b/yarn-project/end-to-end/README.md
@@ -1,7 +1,7 @@
 # End to End
 
 This package includes end-to-end tests that cover Aztec's main milestones.
-These can be run locally either by starting anvil on a different terminal
+These can be run locally either by starting anvil on a different terminal.
 
 ```
 anvil -p 8545 --host 0.0.0.0 --chain-id 31337

From ceabab054bf3f2188335ad893ce4e7706bbed9d2 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 17:39:49 -0400
Subject: [PATCH 3/9] Add missing working dir

---
 .circleci/config.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce327986fb3..db95254ca94 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -745,6 +745,7 @@ jobs:
       - run:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_multi_transfer.test.ts
+          working_directory: yarn-project/end-to-end
 
   e2e-block-building:
     machine:
@@ -840,6 +841,7 @@ jobs:
       - run:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_escrow_contract.test.ts
+          working_directory: yarn-project/end-to-end
 
   e2e-pending-commitments-contract:
     machine:
@@ -935,6 +937,7 @@ jobs:
       - run:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_p2p_network.test.ts
+          working_directory: yarn-project/end-to-end
 
   e2e-browser-sandbox:
     docker:
@@ -946,6 +949,7 @@ jobs:
       - run:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_aztec_js_browser.test.ts docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
 
   aztec-rpc-sandbox:
     docker:
@@ -957,6 +961,7 @@ jobs:
       - run:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local aztec_rpc_sandbox.test.ts docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
 
   guides-writing-an-account-contract:
     machine:
@@ -980,6 +985,7 @@ jobs:
       - run:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
 
   e2e-canary-test:
     docker:

From 132da1a0b4915153ee90e24ca89d46df5cca5f6b Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 17:42:32 -0400
Subject: [PATCH 4/9] Add missing working dir

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index db95254ca94..728f04a2c64 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -734,6 +734,7 @@ jobs:
       - run:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_sandbox_example.test.ts docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
 
   e2e-multi-transfer-contract:
     docker:

From 8e7ce45a396dc3393be6eaf0624af629ab0d0d62 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 17:49:58 -0400
Subject: [PATCH 5/9] Add correct build image

---
 .circleci/config.yml | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 728f04a2c64..44d4623c59d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -725,9 +725,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   e2e-sandbox-example:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env
@@ -737,9 +736,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   e2e-multi-transfer-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env
@@ -929,9 +927,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   e2e-p2p:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env
@@ -941,9 +938,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   e2e-browser-sandbox:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env
@@ -953,9 +949,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   aztec-rpc-sandbox:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env
@@ -977,9 +972,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   guides-dapp-testing:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env
@@ -989,9 +983,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   e2e-canary-test:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env

From f382f9a9064a37632f25ba2c7623bccf5cb1511e Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 17:55:14 -0400
Subject: [PATCH 6/9] Add correct build path

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44d4623c59d..da324b2fa9b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -732,7 +732,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_sandbox_example.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_sandbox_example.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
 
   e2e-multi-transfer-contract:
@@ -945,7 +945,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_aztec_js_browser.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_aztec_js_browser.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
 
   aztec-rpc-sandbox:
@@ -956,7 +956,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local aztec_rpc_sandbox.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local aztec_rpc_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
 
   guides-writing-an-account-contract:
@@ -979,7 +979,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
 
   e2e-canary-test:
@@ -990,7 +990,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_test_script ./scripts/run_tests canary-build uniswap_trade_on_l1_from_l2.test.ts canary-build docker-compose-e2e-sandbox.yml
+          command: cond_spot_run_test_script ./scripts/run_tests canary-build uniswap_trade_on_l1_from_l2.test.ts canary-build ./scripts/docker-compose-e2e-sandbox.yml
 
   build-docs:
     machine:
@@ -1191,7 +1191,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary ./scripts/docker-compose.yml
 
   run-deployment-canary-browser:
     docker:
@@ -1202,7 +1202,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary ./scripts/docker-compose.yml
 
   run-deployment-canary-cli:
     docker:
@@ -1213,7 +1213,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary ./scripts/docker-compose.yml
 
 # Repeatable config for defining the workflow below.
 tag_regex: &tag_regex /^v.*/

From 302fc36c71f34b3ae44c2ffdacff2dd36666be28 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 17:57:12 -0400
Subject: [PATCH 7/9] e2e-canary-test

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index da324b2fa9b..45bbeae3759 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -990,7 +990,8 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_test_script ./scripts/run_tests canary-build uniswap_trade_on_l1_from_l2.test.ts canary-build ./scripts/docker-compose-e2e-sandbox.yml
+          command: ./scripts/cond_run_script canary-build $JOB_NAME ./scripts/run_tests_local uniswap_trade_on_l1_from_l2.test.ts canary-build ./scripts/docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
 
   build-docs:
     machine:

From 5db12cbc6c51fc097fb1d816fe0032e38d53b115 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 18:01:38 -0400
Subject: [PATCH 8/9] Revert store_test_benchmark_logs

---
 scripts/ci/store_test_benchmark_logs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/store_test_benchmark_logs b/scripts/ci/store_test_benchmark_logs
index 92a077c40c0..057d64b4bc3 100755
--- a/scripts/ci/store_test_benchmark_logs
+++ b/scripts/ci/store_test_benchmark_logs
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+set -e
 
 AZTEC_GITHUB_TOKEN=$1
 
@@ -33,11 +33,11 @@ cat /tmp/csv/new.csv \
 if [ -s /tmp/csv/trimmed.csv ]; then
     cd /tmp
     
-    git clone --depth 1 git@github.com:AztecProtocol/benchmark-archive.git
+    git clone --depth 1 https://$AZTEC_GITHUB_TOKEN:@github.com/AztecProtocol/benchmark-archive
 
     cd benchmark-archive
-    git config user.email "circleci@bot"
-    git config user.name "CircleCi Bot"
+    git config --global user.name AztecBot
+    git config --global user.email tech@aztecprotocol.com
     cat /tmp/csv/trimmed.csv >>benchmarks.csv
     git add benchmarks.csv
     git commit -m "Added information from branch $BRANCH commit $COMMIT_HASH"

From 9c301a347f7235221730b1fb3fe2464b8e0a1a71 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 6 Sep 2023 18:13:04 -0400
Subject: [PATCH 9/9] fix e2e-escrow

---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 45bbeae3759..d20ce0863f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -831,9 +831,8 @@ jobs:
           working_directory: yarn-project/end-to-end
 
   e2e-escrow-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    machine:
+      image: ubuntu-2004:202010-01
     steps:
       - *checkout
       - *setup_env