From 7746725d77452ee1797809186677d50e3cfc1eb9 Mon Sep 17 00:00:00 2001
From: Mitch <mitchell@aztecprotocol.com>
Date: Wed, 5 Mar 2025 19:11:25 -0500
Subject: [PATCH] fix: enable test

---
 spartan/bootstrap.sh                          |  7 +++++++
 .../test_upgrade_rollup_with_lock.sh}         | 19 ++++++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename spartan/{tests/upgrade.sh => scripts/test_upgrade_rollup_with_lock.sh} (85%)

diff --git a/spartan/bootstrap.sh b/spartan/bootstrap.sh
index 8c9b7cea605..1ead3ee1355 100755
--- a/spartan/bootstrap.sh
+++ b/spartan/bootstrap.sh
@@ -62,6 +62,7 @@ function test_cmds {
     echo "$hash timeout -v 30m ./spartan/bootstrap.sh test-kind-4epochs"
     echo "$hash timeout -v 30m ./spartan/bootstrap.sh test-kind-upgrade-rollup-version"
     echo "$hash timeout -v 30m ./spartan/bootstrap.sh test-prod-deployment"
+    echo "$hash timeout -v 30m ./spartan/bootstrap.sh test-cli-upgrade-with-lock"
   fi
 }
 
@@ -137,6 +138,12 @@ case "$cmd" in
   "test-prod-deployment")
     FRESH_INSTALL=false INSTALL_METRICS=false ./scripts/test_prod_deployment.sh
     ;;
+  "test-cli-upgrade-with-lock")
+    env
+    FRESH_INSTALL=false INSTALL_METRICS=false \
+      ./scripts/test_kind.sh src/spartan/smoke.test.ts 1-validators.yaml upgrade-with-lock \
+      && ./scripts/test_upgrade_rollup_with_lock.sh upgrade-with-lock
+    ;;
   "test-local")
     # Isolate network stack in docker.
     docker_isolate ../scripts/run_native_testnet.sh -i -val 3
diff --git a/spartan/tests/upgrade.sh b/spartan/scripts/test_upgrade_rollup_with_lock.sh
similarity index 85%
rename from spartan/tests/upgrade.sh
rename to spartan/scripts/test_upgrade_rollup_with_lock.sh
index 0052a78bae1..341b83e000a 100755
--- a/spartan/tests/upgrade.sh
+++ b/spartan/scripts/test_upgrade_rollup_with_lock.sh
@@ -1,22 +1,16 @@
 #!/bin/bash
 
+# This script is used to test the upgrade rollup with lock.
+# The point of the test is primarily to ensure that the CLI is not broken, and the upgrade works.
+
 set -eu
 
 NAMESPACE=$1
 ADDRESS=${2:-"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"} # first addr in junk mnemonic
 L1_CHAIN_ID=${3:-1337}
 
-image=$(kubectl get pod $NAMESPACE-aztec-network-boot-node-0 -n $NAMESPACE -o jsonpath="{.spec.containers[*].image}")
-
-echo $image
-
-# pull the image if it's not already pulled
-if ! docker images $image --format "{{.Repository}}:{{.Tag}}" | grep -q $image; then
-    docker pull $image
-fi
-
-AZTEC_BIN="/usr/src/yarn-project/aztec/dest/bin/index.js"
-EXE="docker run --rm --network=host  $image $AZTEC_BIN"
+AZTEC_BIN=$(git rev-parse --show-toplevel)/yarn-project/aztec/dest/bin/index.js
+EXE="node --no-warnings $AZTEC_BIN"
 
 # Create temporary files for port-forwarding output
 boot_tmpfile=$(mktemp)
@@ -81,9 +75,8 @@ echo "Registry: $registry"
 export L1_CHAIN_ID=$L1_CHAIN_ID
 export ETHEREUM_HOSTS="http://localhost:$eth_port"
 $(git rev-parse --show-toplevel)/spartan/scripts/upgrade_rollup_with_lock.sh \
-    --aztec-docker-image $image \
+    --aztec-bin $AZTEC_BIN \
     --registry $registry \
     --address $ADDRESS \
     --deposit-amount 200000000000000000000000 \
     --mint
-