Merge branch 'gcp-dev2-preship' into 'master'

Pipeline for dags in dev2 and preship [GONRG-5150]

See merge request !72

.gitlab-ci.yml

@@ -48,6 +48,7 @@ stages:
   - scan
   - bootstrap
   - end_to_end_postman_tests
+  - deploy_preship
   - integration
   - attribution
   - publish

devops/gcp/pipeline/override-stages.yml

@@ -13,7 +13,7 @@ variables:
 osdu-gcp-containerize-bootstrap-gitlab:
   variables:
     IMAGE_BOOTSTRAP_NAME: osdu-gcp-bootstrap-segy-to-vds
-    BUILD_ARGS: --build-arg SEGY_VDS_DOCKER_IMAGE_ARG=$OSDU_GCP_COMPOSER_TAG
+    BUILD_ARGS: --build-arg SEGY_VDS_DOCKER_IMAGE_ARG=community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/seismic/open-vds/openvds-ingestion:latest
     BUILD_BOOTSTRAP_PATH: deployments/scripts/gcp/Dockerfile
 
 # FIXME: delete after package registry usage is implemented in DF
@@ -42,10 +42,11 @@ osdu-gcp-deploy-dag:anthos:
     # FIXME: an open-vds image is created in a different repo, need to implement a new logic on how to update the open-vds image in composer with sha/latest/release/tag versions
     OSDU_GCP_COMPOSER_TAG: community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/seismic/open-vds/openvds-ingestion:latest
 
-# FIXME: an open-vds image is created in a different repo, need to implement a new logic on how to update the open-vds image in composer with sha/latest/release/tag versions
-# osdu-gcp-deploy-dag:dev2:
-#   variables:
-#     OSDU_GCP_COMPOSER_TAG: $OSDU_GCP_GCR_REGISTRY/seismic/open-vds/openvds-ingestion:$CI_COMMIT_TAG
+osdu-gcp-deploy-dag:dev2:
+  # FIXME: an open-vds image is created in a different repo, need to implement a new logic on how to update the open-vds image in composer with sha/latest/release/tag versions
+  before_script:
+    - export OSDU_GCP_COMPOSER_TAG=$OSDU_GCP_GCR_REGISTRY/seismic/open-vds/openvds-ingestion:${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}
+    - echo $OSDU_GCP_COMPOSER_TAG
 
 osdu-gcp-deploy-dag:preship:
   variables: