Merge branch 'GONRG-10472-Refactoring-pipelines-for-new-AR' into 'main'

GONRG-10472-Refactoring-pipelines-for-new-AR

See merge request !2

.gitlab-ci.yml

-variables:
-  GC_GCR_REGISTRY: gcr.io/osdu-anthos
-
 include:
   # Stages and standard settings
   - local: "pipelines/stages.yml"
   # Common scripts used in other jobs
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/gc-scripts.yml"
+  # Common variables used in other jobs
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/gc-global-variables.yml"
   # Helm logic
   - local: "pipelines/helm-package.yml"
   # Scripts check logic

pipelines/helm-package.yml

 variables:
   GC_HELM_DEPLOYMENT_DIR: "chart"
   GC_HELM_PACKAGE_NAME: "custom-metrics"
-  GC_GCR_REGISTRY: "gcr.io/osdu-anthos"
 
 .gc_get_latest_helm_package_version:
   script:
@@ -50,6 +49,9 @@ gc-helm-charts-release-gcr:
     name: Google_Cloud
   stage: package
   tags: ["osdu-small"]
+  id_tokens:
+    GITLAB_OIDC_TOKEN:
+      aud: https://iam.googleapis.com/projects/${GC_PROJECT_NUMBER}/locations/global/workloadIdentityPools/${GC_POOL_ID}/providers/${GC_PROVIDER_ID}
   image:
     name: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
     entrypoint: [""]
@@ -59,7 +61,7 @@ gc-helm-charts-release-gcr:
   before_script:
     - apk add --no-cache curl bash
     - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | VERIFY_CHECKSUM=false bash
-    - gcloud auth activate-service-account --key-file=${GC_BAREMETAL_DEPLOY_FILE}
+    - !reference [.gc_obtain_credentials, script]
     - gcloud auth configure-docker gcr.io
   script:
     - !reference [.gc_define_version, script]