Merge branch 'cherry-pick-d27b4bb5' into 'release/0.28'

Fix GC release pipeline

See merge request !348

devops/gc/deploy/Chart.yaml

 apiVersion: v2
-name: gc-osdu-gcz-service-deploy
+name: gc-gcz-service-deploy
 type: application
 description: Installs the GCZ-OSDU on GC platform
 version: 0.1.1

devops/gc/pipeline/override-stages.yml

 variables:
   GC_SUPPORTED_PLATFORM: "linux/amd64"
-  GC_SERVICE: "osdu-gcz-service"
+  GC_SERVICE: "gcz-service"
 
 gc-containerize-gitlab:
   tags: ["osdu-medium"]
@@ -39,8 +39,7 @@ gc-containerize-gcr:
     - yq -i '.transformer.container.image = env(TRANSFORMER_IMAGE)' $GC_HELM_DEPLOYMENT_DIR/values.yaml
     - cat $GC_HELM_DEPLOYMENT_DIR/values.yaml | grep -i image
 
-
-#temp until the deployment verification script issue is resolved
+#Disabling verify deploy script
 gc-deploy:
   script:
     - !reference [.gc_obtain_credentials, script]
@@ -81,8 +80,56 @@ gc-deploy:
       $GC_HELM_SETS
       $GC_HELM_TIMEOUT
 
+#Disabling verify deploy script for release branch
+gc-dev2-deploy:
+  script:
+    - !reference [.gc_obtain_credentials, script]
+    - !reference [.gc_common_config, script]
+    - !reference [.gc_define_version, script]
+    - !reference [.gc_set_image_name, script]
+    - >
+      helm upgrade $GC_SERVICE-deploy oci://$CI_REGISTRY_IMAGE/gc-helm/$GC_HELM_PACKAGE_NAME
+      --version $VERSION
+      --install
+      --create-namespace
+      --namespace=$GC_HELM_NAMESPACE
+      --wait
+      --history-max=3
+      --set global.domain=$GC_DOMAIN
+      --set global.dataPartitionId=$GC_TENANT
+      --set data.imagePullPolicy=Always
+      --set data.serviceAccountName=$GC_SERVICE
+      --set data.bootstrapServiceAccountName=datafier
+      --set data.cronJobServiceAccountName=datafier
+      --set data.sqlConnectionString=$GC_SQL_CONNECTION_STRING
+      --set data.projectId=$GC_PROJECT
+      --set data.dataPartitionIdList=$GC_PARTITION_LIST
+      --set data.adminUserEmail=$GC_ADMIN_USER_EMAIL
+      --set data.airflowComposerEmail=$GC_AIRFLOW_COMPOSER_EMAIL
+      --set data.storageServiceAccountEmail=$GC_STORAGE_SERVICE_ACCOUNT_EMAIL
+      --set data.osduAirflowUrl=$GC_AIRFLOW_URL
+      --set data.sharedTenantName=system
+      --set opa.data.serviceAccountName=opa
+      --set data.bucketName=$GC_POLICY_BUCKET
+      --set data.googleCloudProject=$GC_PROJECT
+      --set data.subscriberPrivateKeyId=$GC_SUBSCRIBER_PRIVATE_KEY_ID
+      --set data.composerClient=$COMPOSER_CLIENT
+      --set conf.intTestEndpoint=$TEST_ENDPOINT
+      --set data.segySdPath=$GC_SEGY_SD_PATH
+      --set data.indexerAugmenterEnabled=true
+      $GC_HELM_SETS
+      $GC_HELM_TIMEOUT
+
 #Tests are disabled until stabilization.
 gc-test:
   rules:
     - if: '$GC == "1"'
       when: never
+
+#Tests are disabled until stabilization.
+gc-dev2-test:
+  rules:
+    - if: '$GC_INT_TEST_TYPE != "python" && $CI_COMMIT_BRANCH =~ /^release/'
+      when: never
+    - if: '$GC_INT_TEST_TYPE != "python" && $GC == "1" && $CI_COMMIT_TAG'
+      when: never
\ No newline at end of file