diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af81fe6e274b30c856bb275c5aa90065266b38a2..31840c3b705b63c6c10fb2dd46c5710907f4f5f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ include: file: "cloud-providers/azure.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/osdu-gcp-gke.yml" + file: "cloud-providers/osdu-gcp-global.yml" - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws-global.yml" diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml index f23363f65bd09b12d4b4790bc717d3fdecd4e190..08a3e48f66af9c6d113807ea58cfcf3d7b4cb907 100644 --- a/devops/gcp/pipeline/override-stages.yml +++ b/devops/gcp/pipeline/override-stages.yml @@ -1,9 +1,6 @@ variables: OSDU_GCP_SERVICE: notification OSDU_GCP_VENDOR: gcp - 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 @@ -17,7 +14,6 @@ variables: --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" osdu-gcp-test: variables: @@ -25,6 +21,6 @@ osdu-gcp-test: REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL osdu-gcp-dev2-test: - variables: - ENVIRONMENT: $OSDU_GCP_ENVIRONMENT - REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL + variables: + ENVIRONMENT: $OSDU_GCP_ENVIRONMENT + REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL