Merge branch 'GONRG-4763_Refactor_DEV2_pipeline_for_Partition' into 'master'

GONRG-4763 Refactor DEV2 pipeline for Partition

See merge request !186

devops/gcp/pipeline/override-stages.yml

@@ -14,15 +14,11 @@ variables:
     --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s
     --set data.bootstrapServiceAccountName=$OSDU_GCP_SERVICE-k8s
   OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: >
-    --set data.partitionAdminAccounts=$OSDU_GCP_PARTITION_ADMIN_ACCOUNTS_DEV2
+    --set data.partitionAdminAccounts=$OSDU_GCP_DEV2_PARTITION_ADMIN_ACCOUNTS
     --set data.projectId=$OSDU_GCP_PROJECT
     --set data.googleAudiences=$GOOGLE_AUDIENCE
     --set data.logLevel=INFO
     --set data.dataPartitionId=$OSDU_GCP_TENANT
-  # FIXME add value below to DEV2 pipeline
-  OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: >
-    --set data.bootstrapImage=$CI_REGISTRY_IMAGE/osdu-gcp-bootstrap-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA
-    --set data.bootstrapServiceAccountName=$OSDU_GCP_BOOTSTRAP_SERVICE_ACCOUNT
   OSDU_GCP_HELM_CONFIG_SERVICE: partition-config
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: partition-deploy
 
@@ -40,19 +36,10 @@ osdu-gcp-deploy-deployment:
     - if [[ "$STATUS" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
 
 osdu-gcp-dev2-deploy-deployment:
-  variables:
-    OSDU_GCP_BOOTSTRAP_SERVICE_ACCOUNT: workload-gke-bootstrap-sa
   needs:
     - osdu-gcp-containerize-gitlab
     - osdu-gcp-containerize-bootstrap-gitlab
     - osdu-gcp-dev2-deploy-configmap
-  after_script:
-    - echo ----- Verify Bootstrap -----
-    - kubectl rollout status deployment.v1.apps/$OSDU_GCP_SERVICE-bootstrap -n $OSDU_GCP_HELM_NAMESPACE --timeout=900s
-    - POD=$(kubectl get pod --sort-by=.metadata.creationTimestamp -n $OSDU_GCP_HELM_NAMESPACE | grep $OSDU_GCP_SERVICE-bootstrap | tail -1 | awk '{print $1}')
-    - STATUS=$(kubectl wait -n $OSDU_GCP_HELM_NAMESPACE --for=condition=Ready pod/$POD --timeout=300s)
-    - echo $STATUS
-    - if [[ "$STATUS" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
 
 osdu-gcp-anthos-deploy-deployment:
   needs: