fix(ci): contracts_deployed check

.circleci/config.yml

@@ -971,8 +971,9 @@ jobs:
             export TF_VAR_NODE_1_PRIVATE_KEY=$NODE_1_PRIVATE_KEY
             export TF_VAR_NODE_2_PRIVATE_KEY=$NODE_2_PRIVATE_KEY
             # Check if l1-contracts have changed
-            if $CONTRACTS_DEPLOYED -eq 1; then
-              deploy_terraform_services yarn-project/aztec-node aztec-sandbox aztec-node aws_efs_file_system.node_data_store
+            if [ "$CONTRACTS_DEPLOYED" -eq 1 ]; then
+              echo "Contracts have changed, taint nodes to force redeploy.."
+              deploy_terraform_services yarn-project/aztec-node aztec-sandbox aztec-node "aws_ecs_task_definition.aztec-node[0],aws_ecs_task_definition.aztec-node[1]"
             else
               deploy_terraform_services yarn-project/aztec-node aztec-sandbox
             fi
@@ -1104,18 +1105,18 @@ workflows:
       - aztec-faucet: *defaults_yarn_project_prod
 
       # Boxes.
-      - boxes-blank-react:
-          requires:
-            - aztec-sandbox
-          <<: *defaults
-      - boxes-blank:
-          requires:
-            - aztec-sandbox
-          <<: *defaults
-      - boxes-token:
-          requires:
-            - aztec-sandbox
-          <<: *defaults
+      # - boxes-blank-react:
+      #     requires:
+      #       - aztec-sandbox
+      #     <<: *defaults
+      # - boxes-blank:
+      #     requires:
+      #       - aztec-sandbox
+      #     <<: *defaults
+      # - boxes-token:
+      #     requires:
+      #       - aztec-sandbox
+      #     <<: *defaults
 
       # End to end tests.
       - e2e-join:

boxes/run_tests

@@ -6,7 +6,7 @@ set -eu
 
 # The box name is the name of the directory containing the docker-compose.yml file
 # The current dir is assumed to be `yarn-project/boxes`, as this script `yarn-project/boxes/run_tests`
-CURRENT_DIR=`dirname $0`
+CURRENT_DIR=$(dirname $0)
 BOX_NAME=${1:-boxes-blank}
 
 cd $CURRENT_DIR/$BOX_NAME
@@ -58,4 +58,4 @@ docker-compose -f $COMPOSE_FILE up --exit-code-from boxes-$BOX_NAME
 # Success - push a new tag for the commit hash with the box name appended
 IMAGE_COMMIT_URI=$SANDBOX_IMAGE_URI-$BOX_NAME
 retry docker tag $SANDBOX_IMAGE_URI $IMAGE_COMMIT_URI
-retry docker push $IMAGE_COMMIT_URI > /dev/null 2>&1
+retry docker push $IMAGE_COMMIT_URI >/dev/null 2>&1

build-system/scripts/deploy_terraform

@@ -39,8 +39,14 @@ fi
 
 terraform init -input=false $BACKEND_CONFIG
 
+IFS=','
+# Tainting listed resources.
 for RESOURCE in $TO_TAINT; do
-  terraform taint $RESOURCE || true
+  if [ "$DRY_DEPLOY" -eq 1 ]; then
+    echo "DRY_DEPLOY: terraform taint $RESOURCE"
+  else
+    terraform taint $RESOURCE || true
+  fi
 done
 
 if [ "$DRY_DEPLOY" -eq 1 ]; then

l1-contracts/REDEPLOY

@@ -1,2 +1,2 @@
 # Append value to force redeploy
-3
+4