From ee2ab9ca3a229117e238c190d53be704a0e18bba Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Mon, 24 Feb 2025 12:41:18 +0000 Subject: [PATCH 1/4] chore: reenable bot in kind tests --- spartan/bootstrap.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/spartan/bootstrap.sh b/spartan/bootstrap.sh index 7703debaa31e..61dd70761653 100755 --- a/spartan/bootstrap.sh +++ b/spartan/bootstrap.sh @@ -116,25 +116,19 @@ case "$cmd" in ./scripts/test_kind.sh src/spartan/smoke.test.ts ci-smoke.yaml smoke ;; "test-kind-4epochs") - # TODO(#12163) reenable bot once not conflicting with transfer - export OVERRIDES="bot.enabled=false" NAMESPACE=4epochs FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false \ ./scripts/test_kind.sh src/spartan/4epochs.test.ts ci.yaml four-epochs ;; "test-kind-transfer") - # TODO(#12163) reenable bot once not conflicting with transfer - export OVERRIDES="bot.enabled=false" NAMESPACE=transfer FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false \ ./scripts/test_kind.sh src/spartan/transfer.test.ts ci.yaml transfer ;; "test-kind-transfer-blob-with-sink") - # TODO(#12163) reenable bot once not conflicting with transfer - export OVERRIDES="blobSink.enabled=true,bot.enabled=false" + export OVERRIDES="blobSink.enabled=true" NAMESPACE=transfer FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false \ ./scripts/test_kind.sh src/spartan/transfer.test.ts ci.yaml transfer-blob-with-sink ;; "test-kind-upgrade-rollup-version") - export OVERRIDES="bot.enabled=false" NAMESPACE=upgrade-rollup-version FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false \ ./scripts/test_kind.sh src/spartan/upgrade_rollup_version.test.ts ci.yaml upgrade-rollup-version ;; From b005fbda4ad80f9b6ee10c41328c5a1c8fd6cb12 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 11 Mar 2025 12:10:37 +0000 Subject: [PATCH 2/4] chore: disable telemetry in ci.yaml --- spartan/aztec-network/values/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/ci.yaml b/spartan/aztec-network/values/ci.yaml index 8e12db265542..b6cb97c5a692 100644 --- a/spartan/aztec-network/values/ci.yaml +++ b/spartan/aztec-network/values/ci.yaml @@ -32,7 +32,7 @@ ethereum: cpu: "200m" telemetry: - enabled: true + enabled: false validator: replicas: 4 From c7faace7cf4cdaeb24770f37b224e24b84dc81bd Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Wed, 12 Mar 2025 15:40:52 +0000 Subject: [PATCH 3/4] fix: post install hook on bot if setupL2Contracts is true --- spartan/aztec-network/templates/transaction-bot.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spartan/aztec-network/templates/transaction-bot.yaml b/spartan/aztec-network/templates/transaction-bot.yaml index 09330adfca0d..270616cfc906 100644 --- a/spartan/aztec-network/templates/transaction-bot.yaml +++ b/spartan/aztec-network/templates/transaction-bot.yaml @@ -5,6 +5,12 @@ metadata: name: {{ include "aztec-network.fullname" . }}-bot labels: app: {{- include "aztec-network.labels" . | nindent 4 }} + {{- if .Values.network.setupL2Contracts }} + annotations: + "helm.sh/hook": post-install + "helm.sh/hook-weight": "10" + "helm.sh/hook-delete-policy": before-hook-creation + {{- end }} spec: replicas: {{ .Values.bot.replicas }} selector: From ba72f6e834d5689513a2b24bd25bf13c068fae85 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:48:07 +0000 Subject: [PATCH 4/4] chore: only transaction-bot changes --- spartan/aztec-network/values/ci.yaml | 2 +- spartan/bootstrap.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spartan/aztec-network/values/ci.yaml b/spartan/aztec-network/values/ci.yaml index b6cb97c5a692..8e12db265542 100644 --- a/spartan/aztec-network/values/ci.yaml +++ b/spartan/aztec-network/values/ci.yaml @@ -32,7 +32,7 @@ ethereum: cpu: "200m" telemetry: - enabled: false + enabled: true validator: replicas: 4 diff --git a/spartan/bootstrap.sh b/spartan/bootstrap.sh index e0ca33eab7e2..a7a0cd8eb7c1 100755 --- a/spartan/bootstrap.sh +++ b/spartan/bootstrap.sh @@ -119,15 +119,19 @@ case "$cmd" in ./scripts/test_kind.sh src/spartan/smoke.test.ts ci-smoke.yaml smoke${NAME_POSTFIX:-} ;; "test-kind-4epochs") + # TODO(#12163) reenable bot once not conflicting with transfer + OVERRIDES="bot.enabled=false" \ FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false \ ./scripts/test_kind.sh src/spartan/4epochs.test.ts ci.yaml four-epochs${NAME_POSTFIX:-} ;; "test-kind-transfer") + # TODO(#12163) reenable bot once not conflicting with transfer + OVERRIDES="blobSink.enabled=true,bot.enabled=false" \ FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false \ ./scripts/test_kind.sh src/spartan/transfer.test.ts ci.yaml transfer${NAME_POSTFIX:-} ;; "test-kind-upgrade-rollup-version") - OVERRIDES="ethereum.acceleratedTestDeployments=false" \ + OVERRIDES="bot.enabled=false,ethereum.acceleratedTestDeployments=false" \ FRESH_INSTALL=${FRESH_INSTALL:-true} INSTALL_METRICS=false \ ./scripts/test_kind.sh src/spartan/upgrade_rollup_version.test.ts ci.yaml upgrade-rollup-version${NAME_POSTFIX:-} ;;