From 10e4ee5effa1e92cc67c5714b1290222cedefb23 Mon Sep 17 00:00:00 2001
From: Aliaksandr Lubouski <aliaksandr_lubouski@epam.com>
Date: Fri, 11 Sep 2020 11:01:29 +0300
Subject: [PATCH 1/2] GONRG-719 added integration tests for cloudrun services

---
 cloud-providers/osdu-gcp-cloudrun.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cloud-providers/osdu-gcp-cloudrun.yml b/cloud-providers/osdu-gcp-cloudrun.yml
index e34fc5c7..abf67572 100644
--- a/cloud-providers/osdu-gcp-cloudrun.yml
+++ b/cloud-providers/osdu-gcp-cloudrun.yml
@@ -72,14 +72,15 @@ osdu-gcp-deploy:
       - $OSDU_GCP == 'true'
 
 osdu-gcp-test:
+  image: maven:3.3.9-jdk-8
   extends:
     - .osdu-gcp-variables
   stage: integration
   needs: ["osdu-gcp-deploy"]
   allow_failure: true
   script:
-    - echo "This is a stub. Integration tests are not implemented for the R3 services."
-    - exit 1
+    - export GCP_DEPLOY_FILE=$(echo $OSDU_GCP_DEPLOY_FILE)
+    - mvn --batch-mode --settings=$CI_PROJECT_DIR/.mvn/community-maven.settings.xml -f testing/pom.xml verify --projects $OSDU_GCP_SERVICE-test-core,$OSDU_GCP_SERVICE-test-gcp
   only:
     variables:
       - $OSDU_GCP == 'true'
-- 
GitLab


From f575da3045a046421c28c5868b6e6adcca554b41 Mon Sep 17 00:00:00 2001
From: Aliaksandr Lubouski <aliaksandr_lubouski@epam.com>
Date: Fri, 11 Sep 2020 12:17:11 +0300
Subject: [PATCH 2/2] GONRG-719 added integration tests for cloudrun services
 and tests variables

---
 cloud-providers/osdu-gcp-cloudrun.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cloud-providers/osdu-gcp-cloudrun.yml b/cloud-providers/osdu-gcp-cloudrun.yml
index abf67572..51fbf4ef 100644
--- a/cloud-providers/osdu-gcp-cloudrun.yml
+++ b/cloud-providers/osdu-gcp-cloudrun.yml
@@ -41,6 +41,16 @@
     OSDU_GCP_CLOUDRUN_REGION: us-central1
     OSDU_GCP_PROJECT: nice-etching-277309
     OSDU_GCP_VPC_CONNECTOR: osdu-connector
+    # common integration tests variables
+    GOOGLE_AUDIENCE: $OSDU_GCP_INTEGRATION_TEST_AUDIENCE
+    DOMAIN: $OSDU_GCP_DOMAIN
+    INTEGRATION_TESTER: $OSDU_GCP_INTEGRATION_TESTER
+    NO_DATA_ACCESS_TESTER: $OSDU_GCP_NO_DATA_ACCESS_TESTER
+    OTHER_RELEVANT_DATA_COUNTRIES: US
+    DEFAULT_DATA_PARTITION_ID_TENANT1: $OSDU_GCP_TENANT_NAME
+    LEGAL_TAG: osdu-demo-legaltag
+    GCLOUD_PROJECT: $OSDU_GCP_PROJECT
+    
 
 osdu-gcp-containerize:
   stage: containerize
-- 
GitLab