Merge branch 'main' into NOISSUE_quote-environment-variables-in-ci

.gitlab-ci.yml

@@ -189,13 +189,12 @@ destroy_review:
     - cd main-clone
     - terraform/environments/scripts/destroy-env.sh "$CI_ENVIRONMENT_SLUG"
   # can't use rules here: https://gitlab.com/gitlab-org/gitlab/-/issues/34077
-  when: manual
-  allow_failure: false
+  allow_failure: true
   rules:
     - if: $CI_COMMIT_BRANCH =~ /^main$|^production$|^noenv\/.*/
       when: never
     - if: $CI_COMMIT_BRANCH
-      when: on_success
+      when: manual
   resource_group: $ENVIRONMENT_ID # never execute terraform in parallel on the same environment
   interruptible: false
 

terraform/environments/scripts/create-or-update-env.sh

@@ -13,6 +13,6 @@ TAG=$2
 
 TF_LOG_PATH=terraform-init.log terraform init
 TF_LOG_PATH=terraform-version.log terraform version
-TF_LOG_PATH=terraform-workspace.log terraform workspace new "$WORKSPACE" || terraform workspace select "$WORKSPACE"
+TF_LOG_PATH=terraform-workspace.log terraform workspace select -or-create=true "$WORKSPACE"
 TF_LOG_PATH=terraform-plan.log terraform plan -var="image_tag=$TAG" -out plan -no-color | tee tfplan.plain
 TF_LOG_PATH=terraform-apply.log terraform apply -auto-approve -parallelism=50 plan
\ No newline at end of file