From 0c59c1e0fe449d8d90bfd30a0d1d7e16c672bc9c Mon Sep 17 00:00:00 2001
From: Igor Zimovets <igor_zimovets@epam.com>
Date: Thu, 20 Jan 2022 12:02:17 +0200
Subject: [PATCH 1/3] add dev2 vars

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0e33ff2..64bc43f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,7 @@ variables:
   OSDU_GCP_VENDOR: gcp
   OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
   OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.os_wellbore_ddms_data_project_id=$OSDU_GCP_PROJECT"
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.os_wellbore_ddms_data_project_id=$OSDU_GCP_PROJECT"
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
   OSDU_GCP_HELM_CONFIG_SERVICE: wellbore-config
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: wellbore-deploy
@@ -53,6 +54,7 @@ include:
     file: "scanners/gitlab-ultimate.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
+    ref: "gcp-fix-hardcoded-values"
     file: "cloud-providers/osdu-gcp-gke.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-- 
GitLab


From 1eba796539fb5a119a8f2826662b55d1fcd3f109 Mon Sep 17 00:00:00 2001
From: Igor Zimovets <igor_zimovets@epam.com>
Date: Thu, 20 Jan 2022 14:18:07 +0200
Subject: [PATCH 2/3] add python test for dev2

---
 .gitlab-ci.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64bc43f6..04a8a151 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -218,6 +218,35 @@ osdu-gcp-test-python:
       --legal_tag $LEGAL_TAG
     - pytest ./functional --environment="./generated/postman_environment.json" --filter-tag=!search
 
+osdu-gcp-dev2-test-python:
+  extends: .osdu-gcp-dev2-variables
+  stage: integration
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk
+  needs: ["osdu-gcp-dev2-deploy-deployment"]
+  script:
+    - apt-get install -y python3-venv
+    - python3 -m venv env
+    - source env/bin/activate
+    - pip install --upgrade pip
+    - pip install wheel pytest pytest-cov
+    - >
+      for REQ in $PIP_REQUIREMENTS ; do
+        pip install -r $REQ
+      done
+    - cd tests/integration
+    - echo $OSDU_GCP_INTEGRATION_TESTER | base64 -d > file.json
+    - gcloud auth activate-service-account --key-file file.json
+    - gcloud config set project $OSDU_GCP_PROJECT
+    - >
+      python gen_postman_env.py
+      --token $(gcloud auth print-access-token)
+      --base_url $OSDU_GCP_WELLBORE_BASE_URL
+      --cloud_provider $OSDU_GCP_VENDOR
+      --data_partition $OSDU_GCP_TENANT
+      --acl_domain $DOMAIN
+      --legal_tag $LEGAL_TAG
+    - pytest ./functional --environment="./generated/postman_environment.json" --filter-tag=!search
+
 # Disable maven job in gcp common gke pipeline
 osdu-gcp-test:
   extends:
-- 
GitLab


From 142016b0ffb8e994af83312f442f2cb0b000378f Mon Sep 17 00:00:00 2001
From: Igor Zimovets <igor_zimovets@epam.com>
Date: Fri, 21 Jan 2022 10:40:20 +0200
Subject: [PATCH 3/3] remove ref

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04a8a151..f96a5abc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,6 @@ include:
     file: "scanners/gitlab-ultimate.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-    ref: "gcp-fix-hardcoded-values"
     file: "cloud-providers/osdu-gcp-gke.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-- 
GitLab