Merge branch 'GONRG-2172-Configure-CICD-Pipeline' into 'master'

Reconfigured CICD for gcp

See merge request !67

.gitlab-ci.yml

@@ -27,6 +27,13 @@ variables:
   IBM_OPENSHIFT_PROJECT: og-cicd
   IBM_VENDOR: ibm
 
+  OSDU_GCP_LOG_LEVEL: INFO
+  OSDU_GCP_SERVICE: seismic-store
+  OSDU_GCP_VENDOR: gcp
+  OSDU_GCP_APPLICATION_NAME: seismic-store
+  OSDU_GCP_APPLICATION: seismic-store
+  OSDU_GCP_ENV_VARS: CLOUDPROVIDER=${OSDU_GCP_CLOUD_PROVIDER},SEISTORE_DES_TARGET_AUDIENCE=${GOOGLE_AUDIENCE},SERVICE_CLOUD_PROJECT=${OSDU_GCP_PROJECT},APP_ENVIRONMENT_IDENTIFIER=${TENANT},IMP_SERVICE_ACCOUNT_SIGNER=${OSDU_GCP_IMP_SERVICE_ACCOUNT_SIGNER},SEISTORE_DES_HOST=${OSDU_GCP_ENTITLEMENTS_URL},SEISTORE_DES_APPKEY=${OSDU_GCP_SEISTORE_DES_APPKEY},DES_REDIS_INSTANCE_ADDRESS=${OSDU_GCP_DES_REDIS_INSTANCE_ADDRESS},DES_REDIS_INSTANCE_PORT=${OSDU_GCP_DES_REDIS_INSTANCE_PORT},LOCKSMAP_REDIS_INSTANCE_ADDRESS=${OSDU_GCP_LOCKSMAP_REDIS_INSTANCE_ADDRESS}  --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
+
 include: 
   # pipeline logic
   - project: "osdu/platform/ci-cd-pipelines"
@@ -61,4 +68,25 @@ include:
 
     #gcp
   - project: "osdu/platform/ci-cd-pipelines"
-    file: "cloud-providers/gcp-seismic-store-service.yml"
+    ref: "master"
+    file: "cloud-providers/osdu-gcp-cloudrun.yml"
+
+osdu-gcp-test:
+  script:
+    - echo "Tests not implemented"
+  extends:
+    - .osdu-gcp-variables
+  only:
+    variables:
+      - $OSDU_GCP == 'true' && $OSDU_GCP_INT_TEST_TYPE != 'python'
+
+osdu-gcp-test-python:
+  script:
+    - echo "Tests not implemented"
+  only:
+    variables:
+      - $OSDU_GCP == 'true' && $OSDU_GCP_INT_TEST_TYPE == 'python'
+
+
+
+

provider/seismic-store-gcp/cloudbuild/cloudbuild.yaml

+steps:
+  - id: 'builder'
+    name: 'gcr.io/cloud-builders/docker'
+    args: [
+            'build',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}-builder:local',
+            '-f', 'docker/builder.Dockerfile',
+            '.'
+    ]
+    waitFor: ['-']
+
+  - id: 'runtime'
+    name: 'gcr.io/cloud-builders/docker'
+    args: [
+            'build',
+            '--build-arg', 'docker_builder_image=gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}-builder:local',
+            '--build-arg', 'PORT=${_PORT}',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:$_SHORT_SHA',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:latest',
+            '-f', 'docker/runtime.Dockerfile',
+            '.'
+    ]
+    waitFor: ['builder']
+
+
+images:
+        - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}'
+