From 9d87f9eab2e9ad11f707ff3bc54b1e6d8d3e35d5 Mon Sep 17 00:00:00 2001 From: spypsy Date: Thu, 14 Dec 2023 18:03:02 +0000 Subject: [PATCH 1/7] fix contracts_deployed check [ci dry-deploy] --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5bc9e5b19e8..7e46dddd81e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -971,7 +971,8 @@ 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 + if [ "$CONTRACTS_DEPLOYED" -eq 1 ]; then + echo "Contracts have changed, deploying node terraforms with tainted EFS" deploy_terraform_services yarn-project/aztec-node aztec-sandbox aztec-node aws_efs_file_system.node_data_store else deploy_terraform_services yarn-project/aztec-node aztec-sandbox From 96010988ea7b95cf185b1c43e556bdb4de11ca33 Mon Sep 17 00:00:00 2001 From: spypsy Date: Thu, 14 Dec 2023 18:16:14 +0000 Subject: [PATCH 2/7] redeploy contracts [ci dry-deploy] --- l1-contracts/REDEPLOY | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l1-contracts/REDEPLOY b/l1-contracts/REDEPLOY index 5407c1d3c07..47cd67fa9a7 100644 --- a/l1-contracts/REDEPLOY +++ b/l1-contracts/REDEPLOY @@ -1,2 +1,2 @@ # Append value to force redeploy -3 \ No newline at end of file +4 \ No newline at end of file From 5e489c0537547cde1fdf8620706899a0318d5bb5 Mon Sep 17 00:00:00 2001 From: spypsy Date: Thu, 14 Dec 2023 19:16:16 +0000 Subject: [PATCH 3/7] enumerate tf resources to taint [ci dry-deploy] --- .circleci/config.yml | 26 +++++++++++++------------- boxes/run_tests | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e46dddd81e..8d9e3966aa7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -973,7 +973,7 @@ jobs: # Check if l1-contracts have changed if [ "$CONTRACTS_DEPLOYED" -eq 1 ]; then echo "Contracts have changed, deploying node terraforms with tainted EFS" - deploy_terraform_services yarn-project/aztec-node aztec-sandbox aztec-node aws_efs_file_system.node_data_store + deploy_terraform_services yarn-project/aztec-node aztec-sandbox aztec-node "aws_efs_file_system.node_data_store[0],aws_efs_file_system.node_data_store[1]" else deploy_terraform_services yarn-project/aztec-node aztec-sandbox fi @@ -1105,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: diff --git a/boxes/run_tests b/boxes/run_tests index c358a9366ee..6a8d41b7aee 100755 --- a/boxes/run_tests +++ b/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 \ No newline at end of file +retry docker push $IMAGE_COMMIT_URI >/dev/null 2>&1 From 826d60cf482afade77b4268ee908c17b29bbb30c Mon Sep 17 00:00:00 2001 From: spypsy Date: Thu, 14 Dec 2023 19:38:24 +0000 Subject: [PATCH 4/7] fix bash separator --- build-system/scripts/deploy_terraform | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build-system/scripts/deploy_terraform b/build-system/scripts/deploy_terraform index 1575b7f46f4..3d0424bb0ed 100755 --- a/build-system/scripts/deploy_terraform +++ b/build-system/scripts/deploy_terraform @@ -39,8 +39,13 @@ fi terraform init -input=false $BACKEND_CONFIG +IFS=',' 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 From 0ed4007184cf607e672332c86f0174262b6356c6 Mon Sep 17 00:00:00 2001 From: spypsy Date: Thu, 14 Dec 2023 19:39:35 +0000 Subject: [PATCH 5/7] [ci dry-deploy] --- build-system/scripts/deploy_terraform | 1 + 1 file changed, 1 insertion(+) diff --git a/build-system/scripts/deploy_terraform b/build-system/scripts/deploy_terraform index 3d0424bb0ed..48222ef990a 100755 --- a/build-system/scripts/deploy_terraform +++ b/build-system/scripts/deploy_terraform @@ -40,6 +40,7 @@ fi terraform init -input=false $BACKEND_CONFIG IFS=',' +# Tainting listed resources. for RESOURCE in $TO_TAINT; do if [ "$DRY_DEPLOY" -eq 1 ]; then echo "DRY_DEPLOY: terraform taint $RESOURCE" From a21c0dd4e0a12f40a0722e7a375622682d831970 Mon Sep 17 00:00:00 2001 From: spypsy Date: Fri, 15 Dec 2023 09:44:07 +0000 Subject: [PATCH 6/7] taint node services instead of EFS --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d9e3966aa7..55d0f9a0514 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -972,8 +972,8 @@ jobs: export TF_VAR_NODE_2_PRIVATE_KEY=$NODE_2_PRIVATE_KEY # Check if l1-contracts have changed if [ "$CONTRACTS_DEPLOYED" -eq 1 ]; then - echo "Contracts have changed, deploying node terraforms with tainted EFS" - deploy_terraform_services yarn-project/aztec-node aztec-sandbox aztec-node "aws_efs_file_system.node_data_store[0],aws_efs_file_system.node_data_store[1]" + 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 From 831cdb3f9602830210843caecfc6874200d5443b Mon Sep 17 00:00:00 2001 From: spypsy Date: Fri, 15 Dec 2023 09:44:38 +0000 Subject: [PATCH 7/7] [ci dry-deploy] --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 55d0f9a0514..a9cf73da295 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -972,7 +972,7 @@ jobs: export TF_VAR_NODE_2_PRIVATE_KEY=$NODE_2_PRIVATE_KEY # Check if l1-contracts have changed if [ "$CONTRACTS_DEPLOYED" -eq 1 ]; then - echo "Contracts have changed, taint nodes to force redeploy." + 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