Common pipeline for preship env [GONRG-5050]

.gitlab-ci.yml

@@ -38,11 +38,11 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/ibm.yml"
 
-  - project: 'osdu/platform/ci-cd-pipelines'
-    file: "cloud-providers/osdu-gcp-gke.yml"
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/osdu-gcp-global.yml"
 
-  - project: 'osdu/platform/ci-cd-pipelines'
-    file: 'publishing/pages.yml'
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "publishing/pages.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "scanners/fossa-maven.yml"

devops/gcp/pipeline/override-stages.yml

@@ -4,7 +4,6 @@ variables:
   OSDU_GCP_VENDOR: gcp
   OSDU_GCP_DEFAULT_DATA_COUNTRY: US
   OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
-  # --- osdu specific variables for GKE ---
   OSDU_GCP_HELM_CONFIG_SERVICE_VARS: >
     --set data.google_audiences=$GOOGLE_AUDIENCE
     --set data.redis_group_host=$REDIS_GROUP_HOST
@@ -20,4 +19,3 @@ variables:
     --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s
   OSDU_GCP_HELM_CONFIG_SERVICE: storage-config
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: storage-deploy
-  OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"