GONRG-4968: finalized changes

.gitlab-ci.yml

@@ -62,7 +62,6 @@ include:
     file: "cloud-providers/azure.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-    ref: "gcp-int-tests-anthos"
     file: "cloud-providers/osdu-gcp-gke.yml"
 
   - local: "devops/gcp/pipeline/override-stages.yml"

devops/gcp/pipeline/override-stages.yml

@@ -4,7 +4,7 @@ variables:
   OSDU_GCP_VENDOR: gcp
   OSDU_GCP_HELM_CONFIG_SERVICE: schema-config
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: schema-deploy
-  OSDU_GCP_HELM_TIMEOUT: "--timeout 20m"
+  OSDU_GCP_HELM_TIMEOUT: "--timeout 15m"
   OSDU_GCP_HELM_CONFIG_SERVICE_VARS: >
     --set data.log_level=INFO
     --set data.google_audiences=$GOOGLE_AUDIENCE
@@ -24,6 +24,14 @@ variables:
   # FIXME add value below for DEV2 pipeline
   # OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: >
 
+osdu-gcp-containerize-bootstrap-gitlab:
+  variables:
+    BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
+
+osdu-gcp-containerize-bootstrap-gcr:
+  variables:
+    BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
+
 # REFACTOR to common pipeline
 osdu-gcp-deploy-deployment:
   needs:
@@ -55,6 +63,12 @@ osdu-gcp-deploy-deployment:
 #      - echo $STATUS
 #      - if [[ "$STATUS" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
 
+osdu-gcp-anthos-deploy-deployment:
+  needs:
+    - osdu-gcp-containerize-gitlab
+    - osdu-gcp-containerize-bootstrap-gitlab
+    - osdu-gcp-anthos-deploy-configmap
+
 osdu-gcp-test:
   script:
     - $MAVEN_BUILD . test-results.log verify -q -f testing/schema-test-core/pom.xml
@@ -91,17 +105,3 @@ osdu-gcp-anthos-test:
     reports:
       junit:
         - testing/schema-test-core/target/*/TEST-*.xml
-
-osdu-gcp-containerize-bootstrap-gitlab:
-  variables:
-    BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
-
-osdu-gcp-containerize-bootstrap-gcr:
-  variables:
-    BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
-
-osdu-gcp-anthos-deploy-deployment:
-  needs:
-    - osdu-gcp-containerize-gitlab
-    - osdu-gcp-containerize-bootstrap-gitlab
-    - osdu-gcp-anthos-deploy-configmap