From afdb66c8189ed2a198d4f1e23cc129c32c6a198d Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <stanislav_riabokon@epam.com>
Date: Tue, 28 Jul 2020 11:05:40 +0400
Subject: [PATCH 01/23] https://jiraeu.epam.com/browse/GONRG-478 Changed a
 version of os-core-common to 0.3.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 15e2dfbb..c7eea3df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <javax.inject.version>1</javax.inject.version>
     <org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
     <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
-    <os-core-common.version>0.0.13-gcp</os-core-common.version>
+    <os-core-common.version>0.3.5</os-core-common.version>
     <lombok.version>1.18.0</lombok.version>
   </properties>
 
-- 
GitLab


From eb67a2af61d530543adf3d80dcef337f79a4fa2b Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Tue, 28 Jul 2020 10:50:56 +0300
Subject: [PATCH 02/23] Change repos and distribution mgmt in pom.xml. Change
 community pom.xml in mvn folder

---
 .mvn/community-maven.settings.xml | 16 ++++++++++++++--
 pom.xml                           | 30 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d..40d92d4b 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,7 +7,13 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<properties>
-				<gitlab-server>community-maven-via-job-token</gitlab-server>
+				<repo.releases.id>community-maven-via-job-token</repo.releases.id>
+				<publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+				<publish.releases.id>community-maven-via-job-token</publish.releases.id>
+
+				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 
@@ -22,7 +28,13 @@
 			</property>
 			</activation>
 			<properties>
-				<gitlab-server>community-maven-via-private-token</gitlab-server>
+				<repo.releases.id>community-maven-via-private-token</repo.releases.id>
+				<publish.snapshots.id>community-maven-via-private-token</publish.snapshots.id>
+				<publish.releases.id>community-maven-via-private-token</publish.releases.id>
+
+				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 	</profiles>
diff --git a/pom.xml b/pom.xml
index c7eea3df..9870e54c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,21 +270,21 @@
   </build>
 
   <repositories>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-    </repository>
-  </repositories>
+		<repository>
+			<id>${repo.releases.id}</id>
+			<url>${repo.releases.url}</url>
+		</repository>
+	</repositories>
 
-  <distributionManagement>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </repository>
-    <snapshotRepository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </snapshotRepository>
-  </distributionManagement>
+	<distributionManagement>
+		<repository>
+			<id>${publish.releases.id}</id>
+			<url>${publish.releases.url}</url>
+		</repository>
+		<snapshotRepository>
+			<id>${publish.snapshots.id}</id>
+			<url>${publish.snapshots.url}</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 </project>
-- 
GitLab


From 17fa212e98e73d1be3e75c66a0f8ad1e345abafd Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <stanislav_riabokon@epam.com>
Date: Tue, 28 Jul 2020 13:03:06 +0400
Subject: [PATCH 03/23] Added a property 'RECORDS_ROOT_URL' into spring files.

---
 .../src/main/resources/application.properties                   | 2 ++
 provider/file-gcp/src/main/resources/application.properties     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/provider/file-gcp-datastore/src/main/resources/application.properties b/provider/file-gcp-datastore/src/main/resources/application.properties
index 2dc95a90..f3088253 100644
--- a/provider/file-gcp-datastore/src/main/resources/application.properties
+++ b/provider/file-gcp-datastore/src/main/resources/application.properties
@@ -25,3 +25,5 @@ spring.cloud.gcp.datastore.namespace=odes-namespace
 
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+
+RECORDS_ROOT_URL=http://localhost:8082/api/storage/v2
diff --git a/provider/file-gcp/src/main/resources/application.properties b/provider/file-gcp/src/main/resources/application.properties
index f0217fed..3d7d013e 100644
--- a/provider/file-gcp/src/main/resources/application.properties
+++ b/provider/file-gcp/src/main/resources/application.properties
@@ -17,3 +17,5 @@
 # TODO: remove it after defined tenant info and auth
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+
+RECORDS_ROOT_URL=http://localhost:8082/api/storage/v2
-- 
GitLab


From afbf56cd3dec9e2a36170bab10c3987750ae0216 Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <stanislav_riabokon@epam.com>
Date: Tue, 28 Jul 2020 11:05:40 +0400
Subject: [PATCH 04/23] https://jiraeu.epam.com/browse/GONRG-478 Changed a
 version of os-core-common to 0.3.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 15e2dfbb..c7eea3df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <javax.inject.version>1</javax.inject.version>
     <org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
     <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
-    <os-core-common.version>0.0.13-gcp</os-core-common.version>
+    <os-core-common.version>0.3.5</os-core-common.version>
     <lombok.version>1.18.0</lombok.version>
   </properties>
 
-- 
GitLab


From d6fc2615231900a4873db0d37cc284337d3a55a8 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Tue, 28 Jul 2020 10:50:56 +0300
Subject: [PATCH 05/23] Change repos and distribution mgmt in pom.xml. Change
 community pom.xml in mvn folder

---
 .mvn/community-maven.settings.xml | 16 ++++++++++++++--
 pom.xml                           | 30 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d..40d92d4b 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,7 +7,13 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<properties>
-				<gitlab-server>community-maven-via-job-token</gitlab-server>
+				<repo.releases.id>community-maven-via-job-token</repo.releases.id>
+				<publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+				<publish.releases.id>community-maven-via-job-token</publish.releases.id>
+
+				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 
@@ -22,7 +28,13 @@
 			</property>
 			</activation>
 			<properties>
-				<gitlab-server>community-maven-via-private-token</gitlab-server>
+				<repo.releases.id>community-maven-via-private-token</repo.releases.id>
+				<publish.snapshots.id>community-maven-via-private-token</publish.snapshots.id>
+				<publish.releases.id>community-maven-via-private-token</publish.releases.id>
+
+				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 	</profiles>
diff --git a/pom.xml b/pom.xml
index c7eea3df..9870e54c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,21 +270,21 @@
   </build>
 
   <repositories>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-    </repository>
-  </repositories>
+		<repository>
+			<id>${repo.releases.id}</id>
+			<url>${repo.releases.url}</url>
+		</repository>
+	</repositories>
 
-  <distributionManagement>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </repository>
-    <snapshotRepository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </snapshotRepository>
-  </distributionManagement>
+	<distributionManagement>
+		<repository>
+			<id>${publish.releases.id}</id>
+			<url>${publish.releases.url}</url>
+		</repository>
+		<snapshotRepository>
+			<id>${publish.snapshots.id}</id>
+			<url>${publish.snapshots.url}</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 </project>
-- 
GitLab


From 8a765f5d9ebc09ac3cf87e67d8f78cc3adb65788 Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <stanislav_riabokon@epam.com>
Date: Tue, 28 Jul 2020 13:03:06 +0400
Subject: [PATCH 06/23] Added a property 'RECORDS_ROOT_URL' into spring files.

---
 .../src/main/resources/application.properties                   | 2 ++
 provider/file-gcp/src/main/resources/application.properties     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/provider/file-gcp-datastore/src/main/resources/application.properties b/provider/file-gcp-datastore/src/main/resources/application.properties
index 2dc95a90..f3088253 100644
--- a/provider/file-gcp-datastore/src/main/resources/application.properties
+++ b/provider/file-gcp-datastore/src/main/resources/application.properties
@@ -25,3 +25,5 @@ spring.cloud.gcp.datastore.namespace=odes-namespace
 
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+
+RECORDS_ROOT_URL=http://localhost:8082/api/storage/v2
diff --git a/provider/file-gcp/src/main/resources/application.properties b/provider/file-gcp/src/main/resources/application.properties
index f0217fed..3d7d013e 100644
--- a/provider/file-gcp/src/main/resources/application.properties
+++ b/provider/file-gcp/src/main/resources/application.properties
@@ -17,3 +17,5 @@
 # TODO: remove it after defined tenant info and auth
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+
+RECORDS_ROOT_URL=http://localhost:8082/api/storage/v2
-- 
GitLab


From 70492811fdf2b46d7cd2b67a2768e3b3b20fddc5 Mon Sep 17 00:00:00 2001
From: Aliaksandr Ramanovich1 <aliaksandr_ramanovich1@epam.com>
Date: Thu, 30 Jul 2020 08:33:37 +0000
Subject: [PATCH 07/23] Change project_id in publish url in pom.xml

---
 .mvn/community-maven.settings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 40d92d4b..90f25dc6 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -12,8 +12,8 @@
 				<publish.releases.id>community-maven-via-job-token</publish.releases.id>
 
 				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
-				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
-				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 
@@ -33,8 +33,8 @@
 				<publish.releases.id>community-maven-via-private-token</publish.releases.id>
 
 				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
-				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
-				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 	</profiles>
-- 
GitLab


From e07bd40765db4a39516bd24cd5f7aa0dae41c250 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Thu, 30 Jul 2020 17:58:38 +0300
Subject: [PATCH 08/23] Fix records_root_url var in properties file

---
 .../src/main/resources/application.properties                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/provider/file-gcp-datastore/src/main/resources/application.properties b/provider/file-gcp-datastore/src/main/resources/application.properties
index 5ace2545..3cc9ab13 100644
--- a/provider/file-gcp-datastore/src/main/resources/application.properties
+++ b/provider/file-gcp-datastore/src/main/resources/application.properties
@@ -25,5 +25,7 @@ spring.cloud.gcp.datastore.namespace=odes-namespace
 
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+gcp.records.root.url=localhost
 
-RECORDS_ROOT_URL=${RECORDS_ROOT_URL}
+# Fix this var later
+RECORDS_ROOT_URL=gcp.records.root.url
-- 
GitLab


From 9c931ce7e151786380192a7a8707783fe8f88ec2 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Thu, 30 Jul 2020 18:08:05 +0300
Subject: [PATCH 09/23] Fix repo ID for File in community pom.xml

---
 .mvn/community-maven.settings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 40d92d4b..90f25dc6 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -12,8 +12,8 @@
 				<publish.releases.id>community-maven-via-job-token</publish.releases.id>
 
 				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
-				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
-				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 
@@ -33,8 +33,8 @@
 				<publish.releases.id>community-maven-via-private-token</publish.releases.id>
 
 				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
-				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
-				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 	</profiles>
-- 
GitLab


From 07386617215d0801a27009454cf558aa2ee65153 Mon Sep 17 00:00:00 2001
From: "Dmitriy Rudko (EPAM)" <dmitriy_rudko@epam.com>
Date: Thu, 30 Jul 2020 11:10:59 -0400
Subject: [PATCH 10/23] Update application.properties

---
 .../src/main/resources/application.properties              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/provider/file-gcp-datastore/src/main/resources/application.properties b/provider/file-gcp-datastore/src/main/resources/application.properties
index 3cc9ab13..d8bf5b29 100644
--- a/provider/file-gcp-datastore/src/main/resources/application.properties
+++ b/provider/file-gcp-datastore/src/main/resources/application.properties
@@ -25,7 +25,8 @@ spring.cloud.gcp.datastore.namespace=odes-namespace
 
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
-gcp.records.root.url=localhost
+gcp.records.url=localhost
+
+# TODO: ENV style variables should not be used in Spring. This should be refactored.
+RECORDS_ROOT_URL=${gcp.records.url}
 
-# Fix this var later
-RECORDS_ROOT_URL=gcp.records.root.url
-- 
GitLab


From 048c489e059eff573566974c9c64c83d7a711f60 Mon Sep 17 00:00:00 2001
From: "Dmitriy Rudko (EPAM)" <dmitriy_rudko@epam.com>
Date: Thu, 30 Jul 2020 11:13:00 -0400
Subject: [PATCH 11/23] Update application.properties

---
 provider/file-gcp/src/main/resources/application.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/provider/file-gcp/src/main/resources/application.properties b/provider/file-gcp/src/main/resources/application.properties
index 3b1ba9f5..56247b77 100644
--- a/provider/file-gcp/src/main/resources/application.properties
+++ b/provider/file-gcp/src/main/resources/application.properties
@@ -17,5 +17,8 @@
 # TODO: remove it after defined tenant info and auth
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+gcp.records.url=localhost
+
+# TODO: ENV style variables should not be used in Spring. This should be refactored.
+RECORDS_ROOT_URL=${gcp.records.url}
 
-RECORDS_ROOT_URL=${RECORDS_ROOT_URL}
-- 
GitLab


From f836c0fcfc5ea6a94b788d2deb36004695e73edf Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Thu, 30 Jul 2020 18:55:54 +0300
Subject: [PATCH 12/23] Ad files for cicd. IBM part is temporary erased from
 gitlab-ci.yml

---
 .gitlab-ci.yml                                | 24 +++++++++++---
 .../cloudbuild/Dockerfile.cloudbuild          | 13 ++++++++
 .../cloudbuild/cloudbuild.yaml                | 31 +++++++++++++++++++
 3 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild
 create mode 100644 provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6296ff4f..916b4c16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,22 @@
 variables:
-  IBM_BUILD_SUBDIR: provider/file-ibm
-  #IBM_INT_TEST_SUBDIR: testing/file-test-ibm
+  OSDU_BUILD_SUBDIR: provider/file-gcp-datastore
+  # OSDU_INT_TEST_SUBDIR: testing/file-test-core
+  OSDU_SERVICE: file
+  OSDU_BUCKET: nice-etching-277309-file 
+  OSDU_NAMESPACE: osdu-namespace
+  OSDU_VPC_CONNECTOR: osdu-connector
+  OSDU_RECORDS_ROOT_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2
+  OSDU_VENDOR: gcp-datastore
+  OSDU_USER_ID: common-user
+  OSDU_APPLICATION_NAME: os-file
+  OSDU_SERVICE_ACCOUNT: osdu-gcp-sa@osdu-cicd-epam.iam.gserviceaccount.com
+  OSDU_ENV_VARS: OSDU_ENTITLEMENTS_URL=$OSDU_ENTITLEMENTS_URL,FILE_LOCATION_BUCKET_NAME=$OSDU_BUCKET,SPRING_CLOUD_GCP_DATASTORE_NAMESPACE=$OSDU_NAMESPACE,FILE_LOCATION_USER_ID=$OSDU_USER_ID,GCP_RECORDS_ROOT_URL=$OSDU_RECORDS_ROOT_URL --vpc-connector=$OSDU_VPC_CONNECTOR 
+  OSDU_ENVIRONMENT: dev
+  OSDU_PROJECT: nice-etching-277309
+  OSDU_TENANT_NAME: osdu
+  OSDU_DEPLOY_ENV: empty
+  PORT: 8080
+
 
 include:
   - project: 'osdu/platform/ci-cd-pipelines'
@@ -24,5 +40,5 @@ include:
   #   file: 'publishing/pages.yml'
 
   - project: "osdu/platform/ci-cd-pipelines"
-    ref: 'master'
-    file: "cloud-providers/ibm.yml"
+    ref: 'osdu-gcp-cloudrun'
+    file: 'cloud-providers/osdu-cloudrun.yml'
diff --git a/provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild b/provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild
new file mode 100644
index 00000000..ed79b9ef
--- /dev/null
+++ b/provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild
@@ -0,0 +1,13 @@
+# Use the official AdoptOpenJDK for a base image.
+# https://hub.docker.com/_/openjdk
+FROM openjdk:8-slim
+WORKDIR /app
+ARG PROVIDER_NAME
+ENV PROVIDER_NAME $PROVIDER_NAME
+ARG PORT
+ENV PORT $PORT
+# Copy the jar to the production image from the builder stage.
+COPY provider/file-${PROVIDER_NAME}/target/file-${PROVIDER_NAME}-*.jar file-${PROVIDER_NAME}.jar
+# Run the web service on container startup.
+CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -jar /app/file-${PROVIDER_NAME}.jar
+
diff --git a/provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml b/provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml
new file mode 100644
index 00000000..a8d36d7f
--- /dev/null
+++ b/provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml
@@ -0,0 +1,31 @@
+# Copyright 2020 Google LLC
+# Copyright 2017-2019, Schlumberger
+# Copyright 2020 EPAM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    args: [
+            'build',
+            '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
+            '--build-arg', 'PORT=${_PORT}',
+            '-t', 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}:${_SHORT_SHA}',
+            '-t', 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}:latest',
+            '-f', 'provider/file-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
+            '.'
+    ]
+
+images:
+  - 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}'
+
-- 
GitLab


From 7784072aafe064696874cc466201790e1d5b5568 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Thu, 30 Jul 2020 17:58:38 +0300
Subject: [PATCH 13/23] Clean-up build for GCP and removed specific build files
 from ROOT or repo

---
 .gitlab-ci.yml                                | 24 +++++++++++---
 .mvn/community-maven.settings.xml             |  8 ++---
 .../cloudbuild/Dockerfile.cloudbuild          | 13 ++++++++
 .../cloudbuild/cloudbuild.yaml                | 31 +++++++++++++++++++
 .../src/main/resources/application.properties |  5 ++-
 .../src/main/resources/application.properties |  5 ++-
 6 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild
 create mode 100644 provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6296ff4f..916b4c16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,22 @@
 variables:
-  IBM_BUILD_SUBDIR: provider/file-ibm
-  #IBM_INT_TEST_SUBDIR: testing/file-test-ibm
+  OSDU_BUILD_SUBDIR: provider/file-gcp-datastore
+  # OSDU_INT_TEST_SUBDIR: testing/file-test-core
+  OSDU_SERVICE: file
+  OSDU_BUCKET: nice-etching-277309-file 
+  OSDU_NAMESPACE: osdu-namespace
+  OSDU_VPC_CONNECTOR: osdu-connector
+  OSDU_RECORDS_ROOT_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2
+  OSDU_VENDOR: gcp-datastore
+  OSDU_USER_ID: common-user
+  OSDU_APPLICATION_NAME: os-file
+  OSDU_SERVICE_ACCOUNT: osdu-gcp-sa@osdu-cicd-epam.iam.gserviceaccount.com
+  OSDU_ENV_VARS: OSDU_ENTITLEMENTS_URL=$OSDU_ENTITLEMENTS_URL,FILE_LOCATION_BUCKET_NAME=$OSDU_BUCKET,SPRING_CLOUD_GCP_DATASTORE_NAMESPACE=$OSDU_NAMESPACE,FILE_LOCATION_USER_ID=$OSDU_USER_ID,GCP_RECORDS_ROOT_URL=$OSDU_RECORDS_ROOT_URL --vpc-connector=$OSDU_VPC_CONNECTOR 
+  OSDU_ENVIRONMENT: dev
+  OSDU_PROJECT: nice-etching-277309
+  OSDU_TENANT_NAME: osdu
+  OSDU_DEPLOY_ENV: empty
+  PORT: 8080
+
 
 include:
   - project: 'osdu/platform/ci-cd-pipelines'
@@ -24,5 +40,5 @@ include:
   #   file: 'publishing/pages.yml'
 
   - project: "osdu/platform/ci-cd-pipelines"
-    ref: 'master'
-    file: "cloud-providers/ibm.yml"
+    ref: 'osdu-gcp-cloudrun'
+    file: 'cloud-providers/osdu-cloudrun.yml'
diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 40d92d4b..90f25dc6 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -12,8 +12,8 @@
 				<publish.releases.id>community-maven-via-job-token</publish.releases.id>
 
 				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
-				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
-				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 
@@ -33,8 +33,8 @@
 				<publish.releases.id>community-maven-via-private-token</publish.releases.id>
 
 				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
-				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.snapshots.url>
-				<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven</publish.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/90/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 	</profiles>
diff --git a/provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild b/provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild
new file mode 100644
index 00000000..ed79b9ef
--- /dev/null
+++ b/provider/file-gcp-datastore/cloudbuild/Dockerfile.cloudbuild
@@ -0,0 +1,13 @@
+# Use the official AdoptOpenJDK for a base image.
+# https://hub.docker.com/_/openjdk
+FROM openjdk:8-slim
+WORKDIR /app
+ARG PROVIDER_NAME
+ENV PROVIDER_NAME $PROVIDER_NAME
+ARG PORT
+ENV PORT $PORT
+# Copy the jar to the production image from the builder stage.
+COPY provider/file-${PROVIDER_NAME}/target/file-${PROVIDER_NAME}-*.jar file-${PROVIDER_NAME}.jar
+# Run the web service on container startup.
+CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -jar /app/file-${PROVIDER_NAME}.jar
+
diff --git a/provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml b/provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml
new file mode 100644
index 00000000..a8d36d7f
--- /dev/null
+++ b/provider/file-gcp-datastore/cloudbuild/cloudbuild.yaml
@@ -0,0 +1,31 @@
+# Copyright 2020 Google LLC
+# Copyright 2017-2019, Schlumberger
+# Copyright 2020 EPAM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    args: [
+            'build',
+            '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
+            '--build-arg', 'PORT=${_PORT}',
+            '-t', 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}:${_SHORT_SHA}',
+            '-t', 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}:latest',
+            '-f', 'provider/file-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
+            '.'
+    ]
+
+images:
+  - 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}'
+
diff --git a/provider/file-gcp-datastore/src/main/resources/application.properties b/provider/file-gcp-datastore/src/main/resources/application.properties
index 5ace2545..d8bf5b29 100644
--- a/provider/file-gcp-datastore/src/main/resources/application.properties
+++ b/provider/file-gcp-datastore/src/main/resources/application.properties
@@ -25,5 +25,8 @@ spring.cloud.gcp.datastore.namespace=odes-namespace
 
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+gcp.records.url=localhost
+
+# TODO: ENV style variables should not be used in Spring. This should be refactored.
+RECORDS_ROOT_URL=${gcp.records.url}
 
-RECORDS_ROOT_URL=${RECORDS_ROOT_URL}
diff --git a/provider/file-gcp/src/main/resources/application.properties b/provider/file-gcp/src/main/resources/application.properties
index 3b1ba9f5..56247b77 100644
--- a/provider/file-gcp/src/main/resources/application.properties
+++ b/provider/file-gcp/src/main/resources/application.properties
@@ -17,5 +17,8 @@
 # TODO: remove it after defined tenant info and auth
 file.location.bucket-name= odes-os-file-temp
 file.location.user-id= common-user
+gcp.records.url=localhost
+
+# TODO: ENV style variables should not be used in Spring. This should be refactored.
+RECORDS_ROOT_URL=${gcp.records.url}
 
-RECORDS_ROOT_URL=${RECORDS_ROOT_URL}
-- 
GitLab


From 8960455098e08d2d43cf3133841e9f4da650caee Mon Sep 17 00:00:00 2001
From: Dmitriy Rudko <dmitriy_rudko@epam.com>
Date: Thu, 30 Jul 2020 21:42:08 -0500
Subject: [PATCH 14/23] Clean up GCP specific files from ROOT. Removed code
 duplication in Maven pom.xml's

---
 Dockerfile                          | 25 ------------
 Dockerfile.cloudbuild               | 10 -----
 cloudbuild.yaml                     | 54 --------------------------
 file-core/pom.xml                   | 18 ---------
 lombok.config                       |  4 --
 pom.xml                             |  7 ----
 provider/file-gcp-datastore/pom.xml | 18 ---------
 provider/file-gcp/pom.xml           | 18 ---------
 provider/file-ibm/pom.xml           | 35 ++++-------------
 testing/file-test-core/pom.xml      | 25 ++++--------
 testing/pom.xml                     | 60 +++++++++++++++++++++++++++++
 11 files changed, 75 insertions(+), 199 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 Dockerfile.cloudbuild
 delete mode 100644 cloudbuild.yaml
 delete mode 100644 lombok.config
 create mode 100644 testing/pom.xml

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index aabe37d3..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Use the official maven/java 8 image to create a build artifact.
-# http://hub.docker.com/_/maven
-FROM maven:3-jdk-8-alpine AS builder
-
-# Copy local code to container image.
-## Create all the needed folders
-WORKDIR /app
-COPY pom.xml .
-COPY .m2/ .m2/
-COPY file-core/ file-core/
-COPY provider/ provider/
-
-# Build a release artifact for the child project
-RUN mvn -T2 package -DskipTests -B -s .m2/settings.xml
-
-# Use the official AdoptOpenJDK for a base image.
-# https://hub.docker.com/_/openjdk
-FROM openjdk:8-slim
-WORKDIR /app
-ARG PROVIDER_NAME
-ENV PROVIDER_NAME $PROVIDER_NAME
-# Copy the jar to the production image from the builder stage.
-COPY --from=builder /app/provider/file-${PROVIDER_NAME}/target/file-${PROVIDER_NAME}-*.jar file-${PROVIDER_NAME}.jar
-# Run the web service on container startup.
-CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -jar /app/file-${PROVIDER_NAME}.jar
diff --git a/Dockerfile.cloudbuild b/Dockerfile.cloudbuild
deleted file mode 100644
index aa09a211..00000000
--- a/Dockerfile.cloudbuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Use the official AdoptOpenJDK for a base image.
-# https://hub.docker.com/_/openjdk
-FROM openjdk:8-slim
-WORKDIR /app
-ARG PROVIDER_NAME
-ENV PROVIDER_NAME $PROVIDER_NAME
-# Copy the jar to the production image from the builder stage.
-COPY provider/file-${PROVIDER_NAME}/target/file-${PROVIDER_NAME}-*.jar file-${PROVIDER_NAME}.jar
-# Run the web service on container startup.
-CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -jar /app/file-${PROVIDER_NAME}.jar
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
deleted file mode 100644
index f9e94886..00000000
--- a/cloudbuild.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-steps:
-  - name: 'gcr.io/$PROJECT_ID/restore_cache'
-    args: [
-            '--bucket=gs://${_CACHE_BUCKET}',
-            '--key=maven-$(find -name pom.xml -exec cksum {} \; | cksum | cut -d " " -f1)',
-            '--key_fallback=maven-'
-    ]
-  - name: 'maven:3-jdk-8-alpine'
-    entrypoint: 'mvn'
-    env:
-      - 'MAVEN_REPO_USER=$_MAVEN_REPO_USER'
-      - 'MAVEN_REPO_PASS=$_MAVEN_REPO_PASS'
-      - 'ARTIFACTORY_LIBS_RELEASE_URL=$_ARTIFACTORY_LIBS_RELEASE_URL'
-      - 'ARTIFACTORY_LIBS_SNAPSHOT_URL=$_ARTIFACTORY_LIBS_SNAPSHOT_URL'
-    # parallel builds (-T2) hang for some reason
-    args: [
-            'package', '-s', '.m2/settings.xml', '--batch-mode', '--errors', '--fail-at-end',
-            '--show-version', '-DinstallAtEnd=true', '-DdeployAtEnd=true', '-DskipTests',
-            '-Dmaven.repo.local=/workspace/.m2/repository',
-            '-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN',
-            '-Djava.awt.headless=true', '-Dhttps.protocols=TLSv1.2'
-    ]
-  - name: 'gcr.io/cloud-builders/docker'
-    args: [
-            'build',
-            '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
-            '-t', 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}:${_SHORT_SHA}',
-            '-t', 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}:latest',
-            '-f', 'Dockerfile.cloudbuild',
-            '.'
-    ]
-  - name: 'gcr.io/$PROJECT_ID/save_cache'
-    args: [
-            '--bucket=gs://${_CACHE_BUCKET}',
-            '--key=maven-$(find -name pom.xml -exec cksum {} \; | cksum | cut -d " " -f1)',
-            '--path=.m2/repository',
-            '--no-clobber'
-    ]
-images:
-  - 'gcr.io/$PROJECT_ID/os-file/file-${_PROVIDER_NAME}'
diff --git a/file-core/pom.xml b/file-core/pom.xml
index 79c425dc..8e846088 100644
--- a/file-core/pom.xml
+++ b/file-core/pom.xml
@@ -56,24 +56,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-    </repository>
-  </repositories>
-
-  <distributionManagement>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </repository>
-    <snapshotRepository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <build>
     <plugins>
       <plugin>
diff --git a/lombok.config b/lombok.config
deleted file mode 100644
index a77d041a..00000000
--- a/lombok.config
+++ /dev/null
@@ -1,4 +0,0 @@
-config.stopbubbling=true
-lombok.fielddefaults.defaultprivate=true
-lombok.addLombokGeneratedAnnotation = true
-lombok.copyableAnnotations += javax.inject.Named
diff --git a/pom.xml b/pom.xml
index 9870e54c..fe1c8c48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,6 @@
 
   <modules>
     <module>file-core</module>
-    <module>testing/file-test-core</module>
 <!--    <module>provider/file-aws</module> FIX: Missing dependencies  -->
     <module>provider/file-gcp</module>
     <module>provider/file-ibm</module>
@@ -148,12 +147,6 @@
       <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opengroup.osdu</groupId>
-      <artifactId>file-test-core</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/provider/file-gcp-datastore/pom.xml b/provider/file-gcp-datastore/pom.xml
index b2361c8f..42677d69 100644
--- a/provider/file-gcp-datastore/pom.xml
+++ b/provider/file-gcp-datastore/pom.xml
@@ -59,24 +59,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-    </repository>
-  </repositories>
-
-  <distributionManagement>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </repository>
-    <snapshotRepository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <build>
     <plugins>
       <plugin>
diff --git a/provider/file-gcp/pom.xml b/provider/file-gcp/pom.xml
index 1d2e917d..73f4ed06 100644
--- a/provider/file-gcp/pom.xml
+++ b/provider/file-gcp/pom.xml
@@ -59,24 +59,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-    </repository>
-  </repositories>
-
-  <distributionManagement>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </repository>
-    <snapshotRepository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <build>
     <plugins>
       <plugin>
diff --git a/provider/file-ibm/pom.xml b/provider/file-ibm/pom.xml
index 0740f29a..6a1558ef 100644
--- a/provider/file-ibm/pom.xml
+++ b/provider/file-ibm/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); 
-	~ you may not use this file except in compliance with the License. ~ You 
-	may obtain a copy of the License at ~ ~ https://www.apache.org/licenses/LICENSE-2.0 
-	~ ~ Unless required by applicable law or agreed to in writing, software ~ 
-	distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 
-	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the 
-	License for the specific language governing permissions and ~ limitations 
+<!-- ~ ~ Licensed under the Apache License, Version 2.0 (the "License");
+	~ you may not use this file except in compliance with the License. ~ You
+	may obtain a copy of the License at ~ ~ https://www.apache.org/licenses/LICENSE-2.0
+	~ ~ Unless required by applicable law or agreed to in writing, software ~
+	distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT
+	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the
+	License for the specific language governing permissions and ~ limitations
 	under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -70,7 +70,7 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-jsr223</artifactId>
@@ -79,25 +79,6 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<id>${gitlab-server}</id>
-			<url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-		</repository>
-
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>${gitlab-server}</id>
-			<url>https://community.opengroup.org/api/v4/projects/44/packages/maven</url>
-		</repository>
-
-		<snapshotRepository>
-			<id>${gitlab-server}</id>
-			<url>https://community.opengroup.org/api/v4/projects/44/packages/maven</url>
-		</snapshotRepository>
-	</distributionManagement>
 
 	<build>
 		<plugins>
diff --git a/testing/file-test-core/pom.xml b/testing/file-test-core/pom.xml
index 71ff8d7d..6e8aa199 100644
--- a/testing/file-test-core/pom.xml
+++ b/testing/file-test-core/pom.xml
@@ -26,6 +26,13 @@
   <name>file-test-core</name>
   <description>Core test project for the file service</description>
 
+  <parent>
+    <groupId>org.opengroup.osdu</groupId>
+    <artifactId>os-file-test</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
@@ -55,22 +62,4 @@
       <artifactId>junit-jupiter</artifactId>
     </dependency>
   </dependencies>
-
-  <repositories>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-    </repository>
-  </repositories>
-
-  <distributionManagement>
-    <repository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </repository>
-    <snapshotRepository>
-      <id>${gitlab-server}</id>
-      <url>https://community.opengroup.org/api/v4/projects/90/packages/maven</url>
-    </snapshotRepository>
-  </distributionManagement>
 </project>
diff --git a/testing/pom.xml b/testing/pom.xml
new file mode 100644
index 00000000..cee1b1af
--- /dev/null
+++ b/testing/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2020 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.opengroup.osdu</groupId>
+  <artifactId>os-file-test</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>File Test</name>
+  <description>Integration tests for File service</description>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <modules>
+    <module>file-test-core</module>
+  </modules>
+
+  <repositories>
+    <repository>
+      <id>${repo.releases.id}</id>
+      <url>${repo.releases.url}</url>
+    </repository>
+  </repositories>
+
+  <distributionManagement>
+    <repository>
+      <id>${publish.releases.id}</id>
+      <url>${publish.releases.url}</url>
+    </repository>
+    <snapshotRepository>
+      <id>${publish.snapshots.id}</id>
+      <url>${publish.snapshots.url}</url>
+    </snapshotRepository>
+  </distributionManagement>
+</project>
-- 
GitLab


From 4652ef62967c6c9575f3a76cb7d15a2ae9146a4a Mon Sep 17 00:00:00 2001
From: Dmitriy Rudko <dmitriy_rudko@epam.com>
Date: Thu, 30 Jul 2020 22:48:23 -0500
Subject: [PATCH 15/23] Moved common unit-testing code to file-core module

---
 pom.xml         | 9 ++++++++-
 testing/pom.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe1c8c48..c0da2bfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,10 +32,11 @@
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>os-file</name>
+  <name>file</name>
   <description>File service</description>
 
   <modules>
+    <module>testing/file-test-core</module> <!-- Common Testing Dependencies-->
     <module>file-core</module>
 <!--    <module>provider/file-aws</module> FIX: Missing dependencies  -->
     <module>provider/file-gcp</module>
@@ -147,6 +148,12 @@
       <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opengroup.osdu</groupId>
+      <artifactId>file-test-core</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/testing/pom.xml b/testing/pom.xml
index cee1b1af..8dd93c31 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -25,7 +25,7 @@
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>File Test</name>
+  <name>file-test</name>
   <description>Integration tests for File service</description>
 
   <licenses>
-- 
GitLab


From d6a6276b411c6af162bcafc41d89af3056d32de4 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Fri, 31 Jul 2020 10:57:33 +0300
Subject: [PATCH 16/23] Change sa for cloudrun

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 916b4c16..89870bfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
   OSDU_VENDOR: gcp-datastore
   OSDU_USER_ID: common-user
   OSDU_APPLICATION_NAME: os-file
-  OSDU_SERVICE_ACCOUNT: osdu-gcp-sa@osdu-cicd-epam.iam.gserviceaccount.com
+  OSDU_SERVICE_ACCOUNT: osdu-gcp-sa@nice-etching-277309.iam.gserviceaccount.com
   OSDU_ENV_VARS: OSDU_ENTITLEMENTS_URL=$OSDU_ENTITLEMENTS_URL,FILE_LOCATION_BUCKET_NAME=$OSDU_BUCKET,SPRING_CLOUD_GCP_DATASTORE_NAMESPACE=$OSDU_NAMESPACE,FILE_LOCATION_USER_ID=$OSDU_USER_ID,GCP_RECORDS_ROOT_URL=$OSDU_RECORDS_ROOT_URL --vpc-connector=$OSDU_VPC_CONNECTOR 
   OSDU_ENVIRONMENT: dev
   OSDU_PROJECT: nice-etching-277309
-- 
GitLab


From 261eb13631a90822cdfe5858b19f44e1fbe24fb0 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Fri, 31 Jul 2020 12:21:44 +0300
Subject: [PATCH 17/23] Change name for PORT var

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89870bfd..d8e31ab3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
   OSDU_PROJECT: nice-etching-277309
   OSDU_TENANT_NAME: osdu
   OSDU_DEPLOY_ENV: empty
-  PORT: 8080
+  OSDU_PORT: 8080
 
 
 include:
-- 
GitLab


From 4da5692852c2c14e14651c1bdf231a3d666c27bf Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Fri, 31 Jul 2020 14:02:07 +0300
Subject: [PATCH 18/23] Rename pipeline. Remove some vars

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8e31ab3..dcdf2764 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,4 +41,4 @@ include:
 
   - project: "osdu/platform/ci-cd-pipelines"
     ref: 'osdu-gcp-cloudrun'
-    file: 'cloud-providers/osdu-cloudrun.yml'
+    file: 'cloud-providers/osdu-gcp-cloudrun.yml'
-- 
GitLab


From 1421bab0d324c6e1e9989deb01a67345a4db8671 Mon Sep 17 00:00:00 2001
From: Oleksandr Kosse <oleksandr_kosse@epam.com>
Date: Mon, 3 Aug 2020 08:41:31 -0400
Subject: [PATCH 19/23] Add ibm steps

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcdf2764..0662a6b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,7 @@
 variables:
+  IBM_BUILD_SUBDIR: provider/file-ibm
+  #IBM_INT_TEST_SUBDIR: testing/file-test-ibm
+
   OSDU_BUILD_SUBDIR: provider/file-gcp-datastore
   # OSDU_INT_TEST_SUBDIR: testing/file-test-core
   OSDU_SERVICE: file
@@ -26,6 +29,11 @@ include:
   - project: 'osdu/platform/ci-cd-pipelines'
     ref: 'master'
     file: 'build/maven.yml'
+    
+  - project: "osdu/platform/ci-cd-pipelines"
+    ref: 'master'
+    file: "cloud-providers/ibm.yml"
+
 
   # - project: 'osdu/platform/ci-cd-pipelines'
   #   ref: 'master'
-- 
GitLab


From 7e1a15eb0ed574758333b13bcd254b81c77a4421 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Wed, 5 Aug 2020 10:34:24 +0300
Subject: [PATCH 20/23] Fix OSDU vars

---
 .gitlab-ci.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0662a6b2..a7a6241e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,23 +2,23 @@ variables:
   IBM_BUILD_SUBDIR: provider/file-ibm
   #IBM_INT_TEST_SUBDIR: testing/file-test-ibm
 
-  OSDU_BUILD_SUBDIR: provider/file-gcp-datastore
-  # OSDU_INT_TEST_SUBDIR: testing/file-test-core
-  OSDU_SERVICE: file
-  OSDU_BUCKET: nice-etching-277309-file 
-  OSDU_NAMESPACE: osdu-namespace
-  OSDU_VPC_CONNECTOR: osdu-connector
-  OSDU_RECORDS_ROOT_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2
-  OSDU_VENDOR: gcp-datastore
-  OSDU_USER_ID: common-user
-  OSDU_APPLICATION_NAME: os-file
-  OSDU_SERVICE_ACCOUNT: osdu-gcp-sa@nice-etching-277309.iam.gserviceaccount.com
-  OSDU_ENV_VARS: OSDU_ENTITLEMENTS_URL=$OSDU_ENTITLEMENTS_URL,FILE_LOCATION_BUCKET_NAME=$OSDU_BUCKET,SPRING_CLOUD_GCP_DATASTORE_NAMESPACE=$OSDU_NAMESPACE,FILE_LOCATION_USER_ID=$OSDU_USER_ID,GCP_RECORDS_ROOT_URL=$OSDU_RECORDS_ROOT_URL --vpc-connector=$OSDU_VPC_CONNECTOR 
-  OSDU_ENVIRONMENT: dev
-  OSDU_PROJECT: nice-etching-277309
-  OSDU_TENANT_NAME: osdu
-  OSDU_DEPLOY_ENV: empty
-  OSDU_PORT: 8080
+  OSDU_GCP_BUILD_SUBDIR: provider/file-gcp-datastore
+  # OSDU_GCP_INT_TEST_SUBDIR: testing/file-test-core
+  OSDU_GCP_SERVICE: file
+  OSDU_GCP_BUCKET: nice-etching-277309-file 
+  OSDU_GCP_NAMESPACE: osdu-namespace
+  OSDU_GCP_VPC_CONNECTOR: osdu-connector
+  OSDU_GCP_RECORDS_ROOT_URL: https://os-storage-dot-nice-etching-277309.uc.r.appspot.com/api/storage/v2
+  OSDU_GCP_VENDOR: gcp-datastore
+  OSDU_GCP_USER_ID: common-user
+  OSDU_GCP_APPLICATION_NAME: os-file
+  OSDU_GCP_SERVICE_ACCOUNT: osdu-gcp-sa@nice-etching-277309.iam.gserviceaccount.com
+  OSDU_GCP_ENV_VARS: OSDU_GCP_ENTITLEMENTS_URL=$OSDU_GCP_ENTITLEMENTS_URL,FILE_LOCATION_BUCKET_NAME=$OSDU_GCP_BUCKET,SPRING_CLOUD_GCP_DATASTORE_NAMESPACE=$OSDU_GCP_NAMESPACE,FILE_LOCATION_USER_ID=$OSDU_GCP_USER_ID,GCP_RECORDS_ROOT_URL=$OSDU_GCP_RECORDS_ROOT_URL --vpc-connector=$OSDU_GCP_VPC_CONNECTOR 
+  OSDU_GCP_ENVIRONMENT: dev
+  OSDU_GCP_PROJECT: nice-etching-277309
+  OSDU_GCP_TENANT_NAME: osdu
+  OSDU_GCP_DEPLOY_ENV: empty
+  OSDU_GCP_PORT: 8080
 
 
 include:
-- 
GitLab


From 46f3954c7c73fb7fc5cd1f3c7ed191b2b6093375 Mon Sep 17 00:00:00 2001
From: xanderom <aliaksandr_ramanovich1@epam.com>
Date: Wed, 5 Aug 2020 12:30:18 +0300
Subject: [PATCH 21/23] Fix var name for entitlement url

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7a6241e..30a89700 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   OSDU_GCP_USER_ID: common-user
   OSDU_GCP_APPLICATION_NAME: os-file
   OSDU_GCP_SERVICE_ACCOUNT: osdu-gcp-sa@nice-etching-277309.iam.gserviceaccount.com
-  OSDU_GCP_ENV_VARS: OSDU_GCP_ENTITLEMENTS_URL=$OSDU_GCP_ENTITLEMENTS_URL,FILE_LOCATION_BUCKET_NAME=$OSDU_GCP_BUCKET,SPRING_CLOUD_GCP_DATASTORE_NAMESPACE=$OSDU_GCP_NAMESPACE,FILE_LOCATION_USER_ID=$OSDU_GCP_USER_ID,GCP_RECORDS_ROOT_URL=$OSDU_GCP_RECORDS_ROOT_URL --vpc-connector=$OSDU_GCP_VPC_CONNECTOR 
+  OSDU_GCP_ENV_VARS: OSDU_ENTITLEMENTS_URL=$OSDU_GCP_ENTITLEMENTS_URL,FILE_LOCATION_BUCKET_NAME=$OSDU_GCP_BUCKET,SPRING_CLOUD_GCP_DATASTORE_NAMESPACE=$OSDU_GCP_NAMESPACE,FILE_LOCATION_USER_ID=$OSDU_GCP_USER_ID,GCP_RECORDS_ROOT_URL=$OSDU_GCP_RECORDS_ROOT_URL --vpc-connector=$OSDU_GCP_VPC_CONNECTOR 
   OSDU_GCP_ENVIRONMENT: dev
   OSDU_GCP_PROJECT: nice-etching-277309
   OSDU_GCP_TENANT_NAME: osdu
-- 
GitLab


From 005470c28ee5b770597a777db6be5d595ab5e497 Mon Sep 17 00:00:00 2001
From: "Dmitriy Rudko (EPAM)" <dmitriy_rudko@epam.com>
Date: Fri, 7 Aug 2020 10:39:09 -0400
Subject: [PATCH 22/23] Uncomment default CICD steps in .gitlab-ci.yml

---
 .gitlab-ci.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30a89700..af9f6d60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,18 +34,17 @@ include:
     ref: 'master'
     file: "cloud-providers/ibm.yml"
 
-
-  # - project: 'osdu/platform/ci-cd-pipelines'
-  #   ref: 'master'
-  #   file: 'scanners/gitlab-ultimate.yml'
-  #
-  # - project: 'osdu/platform/ci-cd-pipelines'
-  #   ref: 'master'
-  #   file: 'scanners/fossa.yml'
-  #
-  # - project: 'osdu/platform/ci-cd-pipelines'
-  #   ref: 'master'
-  #   file: 'publishing/pages.yml'
+   - project: 'osdu/platform/ci-cd-pipelines'
+     ref: 'master'
+     file: 'scanners/gitlab-ultimate.yml'
+  
+   - project: 'osdu/platform/ci-cd-pipelines'
+     ref: 'master'
+     file: 'scanners/fossa.yml'
+  
+   - project: 'osdu/platform/ci-cd-pipelines'
+     ref: 'master'
+     file: 'publishing/pages.yml'
 
   - project: "osdu/platform/ci-cd-pipelines"
     ref: 'osdu-gcp-cloudrun'
-- 
GitLab


From e633be1d250dc280f0a9e8634c370ba69978638a Mon Sep 17 00:00:00 2001
From: "Dmitriy Rudko (EPAM)" <dmitriy_rudko@epam.com>
Date: Fri, 7 Aug 2020 10:41:15 -0400
Subject: [PATCH 23/23] Fix YAML syntax issue in .gitlab-ci.yml

---
 .gitlab-ci.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af9f6d60..96efbbd2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,17 +34,17 @@ include:
     ref: 'master'
     file: "cloud-providers/ibm.yml"
 
-   - project: 'osdu/platform/ci-cd-pipelines'
-     ref: 'master'
-     file: 'scanners/gitlab-ultimate.yml'
+  - project: 'osdu/platform/ci-cd-pipelines'
+    ref: 'master'
+    file: 'scanners/gitlab-ultimate.yml'
   
-   - project: 'osdu/platform/ci-cd-pipelines'
-     ref: 'master'
-     file: 'scanners/fossa.yml'
+  - project: 'osdu/platform/ci-cd-pipelines'
+    ref: 'master'
+    file: 'scanners/fossa.yml'
   
-   - project: 'osdu/platform/ci-cd-pipelines'
-     ref: 'master'
-     file: 'publishing/pages.yml'
+  - project: 'osdu/platform/ci-cd-pipelines'
+    ref: 'master'
+    file: 'publishing/pages.yml'
 
   - project: "osdu/platform/ci-cd-pipelines"
     ref: 'osdu-gcp-cloudrun'
-- 
GitLab