From a9f696f7c394be751bff71e5ca554601f86df232 Mon Sep 17 00:00:00 2001
From: Mitch <mitchell@aztecprotocol.com>
Date: Fri, 27 Sep 2024 12:10:53 -0400
Subject: [PATCH 1/2] add values file as an arg to the earthly command. add a
 values file for a big cluster.

---
 spartan/aztec-network/values/48-validators.yaml | 9 +++++++++
 yarn-project/end-to-end/Earthfile               | 2 ++
 yarn-project/end-to-end/scripts/network_test.sh | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 spartan/aztec-network/values/48-validators.yaml

diff --git a/spartan/aztec-network/values/48-validators.yaml b/spartan/aztec-network/values/48-validators.yaml
new file mode 100644
index 00000000000..1bec71a66ae
--- /dev/null
+++ b/spartan/aztec-network/values/48-validators.yaml
@@ -0,0 +1,9 @@
+validator:
+  debug: "aztec:*,-aztec:avm_simulator:*,-aztec:libp2p_service"
+  replicas: 48
+  validator:
+    disabled: false
+
+bootNode:
+  validator:
+    disabled: true
diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
index d334220f808..3c6d50a62f1 100644
--- a/yarn-project/end-to-end/Earthfile
+++ b/yarn-project/end-to-end/Earthfile
@@ -293,9 +293,11 @@ e2e-cli-wallet:
   RUN COMPOSE_FILE=scripts/docker-compose-wallet.yml ./scripts/e2e_compose_test.sh e2e_cli_wallet
 
 network-smoke:
+  ARG values_file
   LOCALLY
   RUN NAMESPACE=smoke FRESH_INSTALL=true FORCE_BUILD=$force_build VALUES_FILE=${values_file:-default.yaml} ./scripts/network_test.sh ./src/spartan/smoke.test.ts
 
 network-transfer:
+  ARG values_file
   LOCALLY
   RUN NAMESPACE=transfer FRESH_INSTALL=true FORCE_BUILD=$force_build VALUES_FILE=${values_file:-default.yaml} ./scripts/network_test.sh ./src/spartan/transfer.test.ts
diff --git a/yarn-project/end-to-end/scripts/network_test.sh b/yarn-project/end-to-end/scripts/network_test.sh
index b878ccbeeca..cee5e2db674 100755
--- a/yarn-project/end-to-end/scripts/network_test.sh
+++ b/yarn-project/end-to-end/scripts/network_test.sh
@@ -9,7 +9,7 @@
 #   FRESH_INSTALL (default: "false")
 #   AZTEC_DOCKER_TAG (default: current git commit)
 
-set -eu
+set -eux
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 

From c83ec1d3e5e71fefba88101b790fc10bea724f32 Mon Sep 17 00:00:00 2001
From: Mitch <mitchell@aztecprotocol.com>
Date: Fri, 27 Sep 2024 12:27:46 -0400
Subject: [PATCH 2/2] increase timeout, reduce node requirements on 48
 validators

---
 spartan/aztec-network/values/48-validators.yaml | 3 +++
 yarn-project/end-to-end/scripts/network_test.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/spartan/aztec-network/values/48-validators.yaml b/spartan/aztec-network/values/48-validators.yaml
index 1bec71a66ae..3dd5a2cadf3 100644
--- a/spartan/aztec-network/values/48-validators.yaml
+++ b/spartan/aztec-network/values/48-validators.yaml
@@ -1,6 +1,9 @@
 validator:
   debug: "aztec:*,-aztec:avm_simulator:*,-aztec:libp2p_service"
   replicas: 48
+  resources:
+    requests:
+      memory: "512Mi"
   validator:
     disabled: false
 
diff --git a/yarn-project/end-to-end/scripts/network_test.sh b/yarn-project/end-to-end/scripts/network_test.sh
index cee5e2db674..d757c45af80 100755
--- a/yarn-project/end-to-end/scripts/network_test.sh
+++ b/yarn-project/end-to-end/scripts/network_test.sh
@@ -53,7 +53,7 @@ helm install spartan "$(git rev-parse --show-toplevel)/spartan/aztec-network/" \
       --set test="$TEST" \
       --wait \
       --wait-for-jobs=true \
-      --timeout=10m
+      --timeout=30m
 
 kubectl wait pod -l app==pxe --for=condition=Ready -n "$NAMESPACE" --timeout=10m