diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ab6bb2500323882ad35a60ac75a5207b67298ba..102961cb5e838a88e9f1e0cd852d021c524b78ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,17 @@ variables: OSDU_GCP_HELM_DEPLOYMENT_DIR: "devops/gcp/deploy" OSDU_GCP_HELM_CONFIG_DIR: "devops/gcp/configmap" OSDU_GCP_HELM_NAMESPACE: "default" - OSDU_GCP_HELM_CONFIG_SERVICE_VARS: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API" - OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API" - OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s" + OSDU_GCP_HELM_CONFIG_SERVICE_VARS: > + --set data.log_level=$OSDU_GCP_LOG_LEVEL + --set data.google_audiences=$GOOGLE_AUDIENCE + --set data.app_register=$OSDU_GCP_REGISTER_API + OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: > + --set data.log_level=$OSDU_GCP_LOG_LEVEL + --set data.google_audiences=$GOOGLE_AUDIENCE + --set data.app_register=$OSDU_GCP_REGISTER_API + OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: > + --set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA + --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s OSDU_GCP_HELM_CONFIG_SERVICE: "notification-config" OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "notification-deploy" OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" @@ -29,23 +37,18 @@ variables: include: - project: "osdu/platform/ci-cd-pipelines" - ref: "master" file: "standard-setup.yml" - project: "osdu/platform/ci-cd-pipelines" - ref: "master" file: "build/maven.yml" - project: "osdu/platform/ci-cd-pipelines" - ref: "master" file: "scanners/fossa-maven.yml" - project: "osdu/platform/ci-cd-pipelines" - ref: "master" file: "scanners/gitlab-ultimate.yml" - project: "osdu/platform/ci-cd-pipelines" - ref: "master" file: "cloud-providers/azure.yml" - project: "osdu/platform/ci-cd-pipelines"