diff --git a/.github/workflows/aws-terraform-module.yml b/.github/workflows/aws-terraform-module.yml index b3c9c76307e..769ccbaae80 100644 --- a/.github/workflows/aws-terraform-module.yml +++ b/.github/workflows/aws-terraform-module.yml @@ -71,13 +71,13 @@ jobs: cd terraform-module/aws-constellation cp ../../build/constellation . terraform init - terraform apply -var 'name=e2eTfAws' -var 'region=eu-west-1' -var 'zone=eu-west-1b' -var 'name_prefix=e2eTfAws' -auto-approve + terraform apply -var 'name=e2eAwsTF' -var 'region=eu-west-1' -var 'zone=eu-west-1b' -var 'name_prefix=e2eAwsTF' -auto-approve - name: Destroy Terraform Cluster if: always() && (steps.apply_terraform.outcome == 'failure' || steps.apply_terraform.outcome == 'success') run: | cd terraform-module/aws-constellation - terraform destroy -var 'name=e2eTfAws' -var 'region=eu-west-1' -var 'zone=eu-west-1b' -var 'name_prefix=e2eTfAws' -auto-approve + terraform destroy -var 'name=e2eAwsTF' -var 'region=eu-west-1' -var 'zone=eu-west-1b' -var 'name_prefix=e2eAwsTF' -auto-approve - name: Verify cleanup run: | diff --git a/terraform/constellation-cluster/main.tf b/terraform/constellation-cluster/main.tf index c94c4eb706c..0e0d3de10ef 100644 --- a/terraform/constellation-cluster/main.tf +++ b/terraform/constellation-cluster/main.tf @@ -107,8 +107,8 @@ resource "null_resource" "infra_state" { resource "null_resource" "apply" { provisioner "local-exec" { - command = "./constellation init --force" # TODO use apply --yes --skip-phases infrastructure - } + command = "./constellation apply --force --yes --skip-phases infrastructure" + } // need force to allow release images while using the dev build provisioner "local-exec" { when = destroy