diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b648c4223d4fed0b343333b0037777928caa4d11..797b682c2bf5fba1795125b3291ccf1d787b00c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ include: file: "publishing/pages.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/osdu-gcp-gke.yml" + file: "cloud-providers/osdu-gcp-global.yml" - local: "devops/gcp/pipeline/override-stages.yml" diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml index 40cb2632357c0db3e0976a3ddc34789c7cf918bc..b3293749ec06cd5fa8a029d039fb3ccc3ec6ac6f 100644 --- a/devops/gcp/pipeline/override-stages.yml +++ b/devops/gcp/pipeline/override-stages.yml @@ -11,9 +11,8 @@ variables: --set data.redis_search_host=$REDIS_SEARCH_HOST --set data.redis_group_host=$REDIS_GROUP_HOST --set data.google_audiences=$GOOGLE_AUDIENCE - OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: > + 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: indexer-config OSDU_GCP_HELM_DEPLOYMENT_SERVICE: indexer-deploy - OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"