From 676e810b5751c78c9f3a4929784a2726a1a75c0a Mon Sep 17 00:00:00 2001
From: Siarhei Symanovich <siarhei_symanovich@epam.com>
Date: Thu, 3 Feb 2022 23:08:36 +0300
Subject: [PATCH 1/6] feat GONRG-4202 added dev2 pipeline

---
 .gitlab-ci.yml                                |  6 +-
 app/filemetadata/.gitlab-ci.yml               |  5 +-
 .../devops/osdu/cloud-providers/gcp-dev2.yml  | 70 +++++++++++++++++
 .../devops/osdu/cloud-providers/gcp.yml       |  1 +
 app/sdms/.gitlab-ci.yml                       |  7 +-
 .../devops/osdu/cloud-providers/gcp-dev2.yml  | 76 +++++++++++++++++++
 .../cloud-providers/gcp-common-pipeline.yml   |  1 -
 devops/osdu/cloud-providers/gcp.yml           |  4 -
 8 files changed, 161 insertions(+), 9 deletions(-)
 create mode 100644 app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
 create mode 100644 app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
 delete mode 100644 devops/osdu/cloud-providers/gcp.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33008a91..42cafb29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,11 @@ include:
 
   # global
   # gcp
-  - local: "devops/osdu/cloud-providers/gcp.yml"
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/osdu-gcp-variables.yml"
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/osdu-gcp-dev2-variables.yml"
+    ref: GONRG-4202_added_dev2_pipeline_to_seismic
 
   # common gcp pipeline
   - local: "devops/osdu/cloud-providers/gcp-common-pipeline.yml"
diff --git a/app/filemetadata/.gitlab-ci.yml b/app/filemetadata/.gitlab-ci.yml
index f1e7f292..6a23b678 100644
--- a/app/filemetadata/.gitlab-ci.yml
+++ b/app/filemetadata/.gitlab-ci.yml
@@ -16,4 +16,7 @@ include:
   - local: "app/filemetadata/devops/osdu/cloud-providers/azure.yml"
   
   # gcp
-  - local: "app/filemetadata/devops/osdu/cloud-providers/gcp.yml"
\ No newline at end of file
+  - local: "app/filemetadata/devops/osdu/cloud-providers/gcp.yml"
+  - local: "app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml"
+#    rules:
+#      - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
\ No newline at end of file
diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
new file mode 100644
index 00000000..e722550d
--- /dev/null
+++ b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -0,0 +1,70 @@
+.seismic_filemetadata_var:
+  variables:
+    OSDU_GCP_SERVICE: seismic-store-filemetadata
+    OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-filemetadata-configmap
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-filemetadata-deploy
+    OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
+    OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
+    OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
+
+filemetadata-osdu-gcp-dev2-deploy-configmap:
+  stage: deploy
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk
+  extends:
+    - .osdu-gcp-dev2-variables
+    - .seismic_filemetadata_var
+  script:
+    - !reference [.common_dev2, script]
+    - >
+      helm upgrade $OSDU_GCP_HELM_CONFIG_SERVICE $OSDU_GCP_HELM_CONFIG_DIR
+      --install
+      --create-namespace
+      --namespace=$OSDU_GCP_HELM_NAMESPACE
+      --wait
+      --history-max=3
+      $OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2
+  rules:
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+      when: on_success
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+      when: on_success
+    # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
+    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+    #   when: on_success
+    - if: '$OSDU_GCP == "true"'
+      when: on_success
+
+filemetadata-osdu-gcp-dev2-deployment:
+  stage: deploy
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk
+  extends:
+    - .osdu-gcp-dev2-variables
+    - .seismic_filemetadata_var
+  needs: ["filemetadata-osdu-gcp-dev2-deploy-configmap"]
+  script:
+    - !reference [.common_dev2, script]
+    - >
+      helm upgrade $OSDU_GCP_HELM_DEPLOYMENT_SERVICE $OSDU_GCP_HELM_DEPLOYMENT_DIR
+      --install
+      --create-namespace
+      --namespace=$OSDU_GCP_HELM_NAMESPACE
+      --wait
+      --history-max=3
+      $OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2
+    - echo ----- Verify Deployment -----
+    - kubectl rollout status deployment.v1.apps/$OSDU_GCP_SERVICE -n $OSDU_GCP_HELM_NAMESPACE --timeout=900s
+    - POD=$(kubectl get pod --sort-by=.metadata.creationTimestamp -n $OSDU_GCP_HELM_NAMESPACE | grep $OSDU_GCP_SERVICE | 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
+  rules:
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+      when: on_success
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+      when: on_success
+    # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
+    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+    #   when: on_success
+    - if: '$OSDU_GCP == "true"'
+      when: on_success
diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp.yml
index abb9d09a..2ced3080 100644
--- a/app/filemetadata/devops/osdu/cloud-providers/gcp.yml
+++ b/app/filemetadata/devops/osdu/cloud-providers/gcp.yml
@@ -17,6 +17,7 @@ filemetadata-osdu-gcp-containerize-gitlab:
   extends: .osdu-gcp-containerize-gitlab
   before_script:
     - cd app/$FILEMETADATA_SERVICE
+    - sed -i "s/SEGY_LIBRARY_PAT/$SEGY_LIBRARY_FEED_PAT/g" pip.conf
   only:
     changes:
       - devops/**/*
diff --git a/app/sdms/.gitlab-ci.yml b/app/sdms/.gitlab-ci.yml
index 841335ab..33a0c1a5 100644
--- a/app/sdms/.gitlab-ci.yml
+++ b/app/sdms/.gitlab-ci.yml
@@ -18,7 +18,7 @@ include:
 
   # containerize
   # osdu
-  - project: "app/sdms/devops/osdu/containerize/osdu.yml"
+  - local: "app/sdms/devops/osdu/containerize/osdu.yml"
 
   # deploy
   # azure
@@ -29,6 +29,9 @@ include:
   
   # gcp
   - local: "app/sdms/devops/osdu/cloud-providers/gcp.yml"
-  
+  - local: "app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml"
+#    rules:
+#      - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+
   # ibm
   - local: "app/sdms/devops/osdu/cloud-providers/ibm.yml"
\ No newline at end of file
diff --git a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
new file mode 100644
index 00000000..00a47cc4
--- /dev/null
+++ b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -0,0 +1,76 @@
+.seismic_sdms_var:
+  variables:
+    GCP_SDMS_PREFIX: /api/seismic-store/v3
+    OSDU_GCP_SERVICE: seismic-store
+    OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-configmap
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy
+    OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
+    OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
+    OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
+
+
+sdms-osdu-gcp-dev2-deploy-configmap:
+  stage: deploy
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk
+  extends:
+    - .osdu-gcp-dev2-variables 
+    - .seismic_sdms_var
+  before_script:
+    - sed -i 's|#{SDMS_PREFIX}#|'$GCP_SDMS_PREFIX'|' ${OSDU_GCP_HELM_CONFIG_DIR}/values.yaml
+  script:
+    - !reference [.common_dev2, script]
+    - >
+      helm upgrade $OSDU_GCP_HELM_CONFIG_SERVICE $OSDU_GCP_HELM_CONFIG_DIR
+      --install
+      --create-namespace
+      --namespace=$OSDU_GCP_HELM_NAMESPACE
+      --wait
+      --history-max=3
+      $OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2
+  rules:
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+      when: on_success
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+      when: on_success
+    # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
+    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+    #   when: on_success
+    - if: '$OSDU_GCP == "true"'
+      when: on_success
+
+sdms-osdu-gcp-dev2-deployment:
+  stage: deploy
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk
+  extends:
+  - .osdu-gcp-dev2-variables 
+  - .seismic_sdms_var
+  needs: ["sdms-osdu-gcp-dev2-deploy-configmap"]
+  before_script:
+    - sed -i 's|#{SDMS_PREFIX}#|'$GCP_SDMS_PREFIX'|' ${OSDU_GCP_HELM_DEPLOYMENT_DIR}/values.yaml
+  script:
+    - !reference [.common_dev2, script]
+    - >
+      helm upgrade $OSDU_GCP_HELM_DEPLOYMENT_SERVICE $OSDU_GCP_HELM_DEPLOYMENT_DIR
+      --install
+      --create-namespace
+      --namespace=$OSDU_GCP_HELM_NAMESPACE
+      --wait
+      --history-max=3
+      $OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2
+    - echo ----- Verify Deployment -----
+    - kubectl rollout status deployment.v1.apps/$OSDU_GCP_SERVICE -n $OSDU_GCP_HELM_NAMESPACE --timeout=900s
+    - POD=$(kubectl get pod --sort-by=.metadata.creationTimestamp -n $OSDU_GCP_HELM_NAMESPACE | grep $OSDU_GCP_SERVICE | 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
+  rules:
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_BRANCH =~ /^release/'
+      when: on_success
+    - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
+      when: on_success
+    # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
+    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+    #   when: on_success
+    - if: '$OSDU_GCP == "true"'
+      when: on_success
diff --git a/devops/osdu/cloud-providers/gcp-common-pipeline.yml b/devops/osdu/cloud-providers/gcp-common-pipeline.yml
index c454c828..332ff9f6 100644
--- a/devops/osdu/cloud-providers/gcp-common-pipeline.yml
+++ b/devops/osdu/cloud-providers/gcp-common-pipeline.yml
@@ -75,7 +75,6 @@
       - main
       - merge_requests
 
-
 .osdu-gcp-deployment:
   extends: .osdu-gcp-variables
   image: gcr.io/google.com/cloudsdktool/cloud-sdk
diff --git a/devops/osdu/cloud-providers/gcp.yml b/devops/osdu/cloud-providers/gcp.yml
deleted file mode 100644
index dcb3930e..00000000
--- a/devops/osdu/cloud-providers/gcp.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-include:
-  # pipeline logic
-  - project: "osdu/platform/ci-cd-pipelines"
-    file: "cloud-providers/osdu-gcp-variables.yml"
-- 
GitLab


From e75d39d54aeeddb81780a7c04e2a6aea1e03ef9d Mon Sep 17 00:00:00 2001
From: Siarhei Symanovich <siarhei_symanovich@epam.com>
Date: Fri, 4 Feb 2022 17:53:19 +0300
Subject: [PATCH 2/6] fix added redis host and workload identity

---
 app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml | 2 +-
 app/sdms/devops/gcp/configmap/values.yaml                 | 4 ++--
 app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
index e722550d..9324c8cd 100644
--- a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -6,7 +6,7 @@
     OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
     OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s"
 
 filemetadata-osdu-gcp-dev2-deploy-configmap:
   stage: deploy
diff --git a/app/sdms/devops/gcp/configmap/values.yaml b/app/sdms/devops/gcp/configmap/values.yaml
index 64a8bb52..6e86d7b2 100644
--- a/app/sdms/devops/gcp/configmap/values.yaml
+++ b/app/sdms/devops/gcp/configmap/values.yaml
@@ -14,9 +14,9 @@ data:
   imp_service_account_signer: ""
   des_service_host_entitlement: "http://entitlements/api"
   seistore_des_appkey: ""
-  des_redis_instance_address: ""
+  des_redis_instance_address: "redis-cache-ddms"
   des_redis_instance_port: "6379"
-  locksmap_redis_instance_address: ""
+  locksmap_redis_instance_address: "redis-cache-ddms"
   locksmap_redis_instance_port: "6379"
   url_prefix: #{SDMS_PREFIX}#
 conf:
diff --git a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
index 00a47cc4..276413e0 100644
--- a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -7,7 +7,7 @@
     OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
     OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s"
 
 
 sdms-osdu-gcp-dev2-deploy-configmap:
-- 
GitLab


From 8b044a029f7a827e2a894af5aa91c1298d62680c Mon Sep 17 00:00:00 2001
From: Siarhei Symanovich <siarhei_symanovich@epam.com>
Date: Fri, 4 Feb 2022 18:10:45 +0300
Subject: [PATCH 3/6] fix workload identity

---
 app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml | 2 +-
 app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
index 9324c8cd..e722550d 100644
--- a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -6,7 +6,7 @@
     OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
     OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
 
 filemetadata-osdu-gcp-dev2-deploy-configmap:
   stage: deploy
diff --git a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
index 276413e0..f67e99e4 100644
--- a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -7,7 +7,7 @@
     OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
     OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$SEISMIC_OSDU_GCP_SERVICE-k8s"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
 
 
 sdms-osdu-gcp-dev2-deploy-configmap:
-- 
GitLab


From d3fe2e95d041c46d567271585172c9a330305e5c Mon Sep 17 00:00:00 2001
From: Siarhei Symanovich <siarhei_symanovich@epam.com>
Date: Fri, 4 Feb 2022 19:02:29 +0300
Subject: [PATCH 4/6] fix added devtwo app_environment_identifier

---
 app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml | 2 +-
 app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
index e722550d..e3173114 100644
--- a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -6,7 +6,7 @@
     OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
     OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.app_environment_identifier=devtwo"
 
 filemetadata-osdu-gcp-dev2-deploy-configmap:
   stage: deploy
diff --git a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
index f67e99e4..8741acaa 100644
--- a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -7,7 +7,7 @@
     OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
     OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s --set data.app_environment_identifier=devtwo"
 
 
 sdms-osdu-gcp-dev2-deploy-configmap:
-- 
GitLab


From d44fe6b1929636b2ecc11927a2a81dbf076a96c8 Mon Sep 17 00:00:00 2001
From: Siarhei Symanovich <siarhei_symanovich@epam.com>
Date: Fri, 4 Feb 2022 19:21:18 +0300
Subject: [PATCH 5/6]  fix added devtwo app_environment_identifier

---
 app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml | 4 ++--
 app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
index e3173114..f61c03a4 100644
--- a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -5,8 +5,8 @@
     OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-filemetadata-deploy
     OSDU_GCP_HELM_CONFIG_DIR: "app/filemetadata/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/filemetadata/devops/gcp/deploy"
-    OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.app_environment_identifier=devtwo"
+    OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN --set data.app_environment_identifier=$OSDU_GCP_TENANT"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA"
 
 filemetadata-osdu-gcp-dev2-deploy-configmap:
   stage: deploy
diff --git a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
index 8741acaa..ab16d5c2 100644
--- a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -6,8 +6,8 @@
     OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy
     OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
     OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
-    OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN"
-    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s --set data.app_environment_identifier=devtwo"
+    OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.domain=$DOMAIN --set data.app_environment_identifier=$OSDU_GCP_TENANT"
+    OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
 
 
 sdms-osdu-gcp-dev2-deploy-configmap:
-- 
GitLab


From 3e9ea03ae04d189c6253446277ba81a2bf13ed8e Mon Sep 17 00:00:00 2001
From: Siarhei Symanovich <siarhei_symanovich@epam.com>
Date: Wed, 9 Feb 2022 11:50:36 +0300
Subject: [PATCH 6/6] ci fix

---
 app/filemetadata/.gitlab-ci.yml                           | 4 ++--
 app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml | 8 ++++----
 app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml         | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/filemetadata/.gitlab-ci.yml b/app/filemetadata/.gitlab-ci.yml
index eb7de00a..c9512b1e 100644
--- a/app/filemetadata/.gitlab-ci.yml
+++ b/app/filemetadata/.gitlab-ci.yml
@@ -13,5 +13,5 @@ include:
   # gcp
   - local: "app/filemetadata/devops/osdu/cloud-providers/gcp.yml"
   - local: "app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml"
-#    rules:
-#      - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
\ No newline at end of file
+    rules:
+      - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
\ No newline at end of file
diff --git a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
index ee3dbf6c..af4ba559 100644
--- a/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/filemetadata/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -30,8 +30,8 @@ filemetadata-osdu-gcp-dev2-deploy-configmap:
     - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
       when: on_success
     # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
-    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
-    #   when: on_success
+    - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+      when: on_success
     - if: '$OSDU_GCP == "true"'
       when: on_success
 
@@ -64,7 +64,7 @@ filemetadata-osdu-gcp-dev2-deployment:
     - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
       when: on_success
     # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
-    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
-    #   when: on_success
+    - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+      when: on_success
     - if: '$OSDU_GCP == "true"'
       when: on_success
diff --git a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
index 1d3e97e8..62ebdae0 100644
--- a/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
+++ b/app/sdms/devops/osdu/cloud-providers/gcp-dev2.yml
@@ -34,8 +34,8 @@ sdms-osdu-gcp-dev2-deploy-configmap:
     - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
       when: on_success
     # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
-    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
-    #   when: on_success
+    - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+      when: on_success
     - if: '$OSDU_GCP == "true"'
       when: on_success
 
@@ -70,7 +70,7 @@ sdms-osdu-gcp-dev2-deployment:
     - if: '$OSDU_GCP == "true" && $CI_COMMIT_TAG'
       when: on_success
     # The variable DEV2="true" should be specified manually in GitLab before running a pipeline to test this job against a protected branch
-    # - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
-    #   when: on_success
+    - if: '$OSDU_GCP == "true" && $DEV2 == "true"'
+      when: on_success
     - if: '$OSDU_GCP == "true"'
       when: on_success
-- 
GitLab