diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac38137257c6e4e916f10bfd558a4182a104c118..56d01f23b9fb726613d80c7c2bd6d95062fdf627 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,9 +49,9 @@ check-magento: TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/magento TF_VAR_ec_apikey: $EC_API_KEY TF_VAR_project_id: $GCP_PROJECT_ID + TF_VAR_region: $GCP_REGION + TF_VAR_vpc_subnetwork_name: $GCP_SUBNETWORK_NAME GCP_SA_GITLAB: $GCP_SA_GITLAB - GCP_REGION: $GCP_REGION - GCP_SUBNETWORK_NAME: $GCP_SUBNETWORK_NAME script: |- cd $TF_ROOT_MAGENTO echo $GCP_SA_GITLAB > gcp-sa.json @@ -97,9 +97,9 @@ apply-magento: TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/magento TF_VAR_ec_apikey: $EC_API_KEY TF_VAR_project_id: $GCP_PROJECT_ID + TF_VAR_region: $GCP_REGION + TF_VAR_vpc_subnetwork_name: $GCP_SUBNETWORK_NAME GCP_SA_GITLAB: $GCP_SA_GITLAB - GCP_REGION: $GCP_REGION - GCP_SUBNETWORK_NAME: $GCP_SUBNETWORK_NAME script: |- cd $TF_ROOT_MAGENTO echo $GCP_SA_GITLAB > gcp-sa.json @@ -107,7 +107,7 @@ apply-magento: gitlab-terraform apply -auto-approve gcloud-psc: - stage: test + stage: deploy needs: - apply-elastic - apply-magento