diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09286484960882a59bf43673b2d1f2e35c1ce6a0..c9cefd2216b27279684add85bc103a475f00f9d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,16 +88,7 @@ tf-apply: echo "image_ohpc defined as ${TF_VAR_image_ohpc}" fi - export TF_VAR_keypair_name="os-gen-keypair-$BUILD_DATE" - - | - terraform apply -auto-approve - if [ $? -ne 0 ]; then - echo "Terraform apply failed. Running terraform destroy..." - terraform destroy -auto-approve - TF_SUCCESS=false - else - TF_SUCCESS=true - fi - echo "Terraform success: $TF_SUCCESS" + - terraform apply -auto-approve - export instance_floating_ip=$(terraform output -raw floating_ip_ohpc) - export instance_id=$(terraform output -raw xdmod_instance_id) - echo "instance_floating_ip=${instance_floating_ip}" | tee -a $CI_PROJECT_DIR/vars.env