From ec69da8bcca82c83c85879e12c1ff892e373c465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20B=C3=A9jean?= <nicolas@bejean.fr>
Date: Tue, 14 Dec 2021 17:44:08 +0100
Subject: [PATCH] feat: Add before_script
---
.gitlab-ci.yml | 54 +++++++++++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9d16b2..9cff690 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,15 +102,18 @@ gcloud-psc:
GCP_DNS_ZONE_GKE_ELASTIC: $GCP_DNS_ZONE_GKE_ELASTIC
EC_SERVICE_ATTACHMENT_URI: $EC_SERVICE_ATTACHMENT_URI
EC_DNS_ZONE: $EC_DNS_ZONE
- script: |-
- echo $GCP_SA > gcp-sa.json
- gcloud auth activate-service-account --key-file gcp-sa.json
- echo "Activate Service Account: OK"
- gcloud config set project $GCP_PROJECT_ID
- echo "Set Project: OK"
- cd $GCLOUD_ROOT_PSC
- chmod +x ./setting-psc.sh
- ./setting-psc.sh
+ before_script:
+ - |
+ echo $GCP_SA > gcp-sa.json
+ gcloud auth activate-service-account --key-file gcp-sa.json
+ echo "Activate Service Account: OK"
+ gcloud config set project $GCP_PROJECT_ID
+ echo "Set Project: OK"
+ cd $GCLOUD_ROOT_PSC
+ script:
+ - |
+ chmod +x ./setting-psc.sh
+ ./setting-psc.sh
artifacts:
paths:
- ${CI_PROJECT_DIR}/pscConnectionId.env
@@ -128,14 +131,17 @@ check-elastic:
variables:
TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/elastic
TF_VAR_ec_apikey: $EC_API_KEY
- script: |-
- export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
- cd $TF_ROOT_ELASTIC
- gitlab-terraform init
- gitlab-terraform validate
- gitlab-terraform fmt -check
- gitlab-terraform plan
- gitlab-terraform plan-json
+ before_script:
+ - |
+ export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
+ cd $TF_ROOT_ELASTIC
+ script:
+ - |
+ gitlab-terraform init
+ gitlab-terraform validate
+ gitlab-terraform fmt -check
+ gitlab-terraform plan
+ gitlab-terraform plan-json
artifacts:
name: plan
paths:
@@ -156,9 +162,11 @@ apply-elastic:
variables:
TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/elastic
TF_VAR_ec_apikey: $EC_API_KEY
- script: |-
- export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
- cd $TF_ROOT_ELASTIC
- gitlab-terraform init
- gitlab-terraform apply -auto-approve
-
\ No newline at end of file
+ before_script:
+ - |
+ export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
+ cd $TF_ROOT_ELASTIC
+ script:
+ - |
+ gitlab-terraform init
+ gitlab-terraform apply -auto-approve
--
GitLab