From 73ed51f712c81943aea7735af17b6083f52514ae Mon Sep 17 00:00:00 2001
From: Aliaksei Kruk2 <aliaksei_kruk2@epam.com>
Date: Thu, 26 May 2022 09:50:39 +0300
Subject: [PATCH 1/4] test pipeline devel-container-gcr

---
 .gitlab-ci.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d67a9be5..3610bf26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ cache:
   paths:
   - ccache
   - 3rdparty
-devel-container:
+devel-container-gitlab:
   stage: prepare
   image: docker:19.03
   tags:
@@ -23,6 +23,22 @@ devel-container:
   - docker push $SHA_IMAGE_TAG
   only:
   - master
+devel-container-gcr:
+  stage: prepare
+  image: docker:19.03
+  tags:
+  - docker-runner
+  variables:
+    IMAGE_NAME: "seismic/open-vds/openvds-ingestion"
+    OSDU_GCP_GCR_REGISTRY: "gcr.io/osdu-anthos"
+  before_script:
+  - cat $OSDU_GCP_DEPLOY_FILE | docker login -u _json_key --password-stdin https://gcr.io
+  script:
+  - docker build -t $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG -f docker/alpine-gitlab-ci.Dockerfile .
+  - docker push $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME
+  # rules:
+  # - if: "$OSDU_GCP == 'true' && $CI_COMMIT_TAG"
+  #   when: on_success
 devel-container-merge-request:
   stage: prepare
   image: docker:19.03
-- 
GitLab


From 792ce4f86ae1750910879702fe0d098895e36215 Mon Sep 17 00:00:00 2001
From: Aliaksei Kruk2 <aliaksei_kruk2@epam.com>
Date: Thu, 26 May 2022 11:27:13 +0300
Subject: [PATCH 2/4] test pipeline

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3610bf26..ca570e73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,19 +26,19 @@ devel-container-gitlab:
 devel-container-gcr:
   stage: prepare
   image: docker:19.03
-  tags:
-  - docker-runner
+  tags: ["osdu-small"]
   variables:
     IMAGE_NAME: "seismic/open-vds/openvds-ingestion"
     OSDU_GCP_GCR_REGISTRY: "gcr.io/osdu-anthos"
   before_script:
   - cat $OSDU_GCP_DEPLOY_FILE | docker login -u _json_key --password-stdin https://gcr.io
   script:
-  - docker build -t $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG -f docker/alpine-gitlab-ci.Dockerfile .
-  - docker push $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME
-  # rules:
+  - docker build --tag $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG --file docker/alpine-gitlab-ci.Dockerfile .
+  - docker push $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG
+  rules:
+  - if: "$OSDU_GCP == 'true'"
   # - if: "$OSDU_GCP == 'true' && $CI_COMMIT_TAG"
-  #   when: on_success
+    when: on_success
 devel-container-merge-request:
   stage: prepare
   image: docker:19.03
-- 
GitLab


From 1accf3cca64990dd0969553c3b5e53793913744e Mon Sep 17 00:00:00 2001
From: Aliaksei Kruk2 <aliaksei_kruk2@epam.com>
Date: Thu, 26 May 2022 11:35:02 +0300
Subject: [PATCH 3/4] test pipeline

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca570e73..a281877f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,13 +28,13 @@ devel-container-gcr:
   image: docker:19.03
   tags: ["osdu-small"]
   variables:
-    IMAGE_NAME: "seismic/open-vds/openvds-ingestion"
+    OSDU_GCP_IMAGE_PATH: "seismic/open-vds/openvds-ingestion"
     OSDU_GCP_GCR_REGISTRY: "gcr.io/osdu-anthos"
   before_script:
   - cat $OSDU_GCP_DEPLOY_FILE | docker login -u _json_key --password-stdin https://gcr.io
   script:
-  - docker build --tag $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG --file docker/alpine-gitlab-ci.Dockerfile .
-  - docker push $OSDU_GCP_GCR_REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG
+  - docker build --tag $OSDU_GCP_GCR_REGISTRY/$OSDU_GCP_IMAGE_PATH:$CI_COMMIT_REF_SLUG --file docker/alpine-gitlab-ci.Dockerfile .
+  - docker push $OSDU_GCP_GCR_REGISTRY/$OSDU_GCP_IMAGE_PATH:$CI_COMMIT_REF_SLUG
   rules:
   - if: "$OSDU_GCP == 'true'"
   # - if: "$OSDU_GCP == 'true' && $CI_COMMIT_TAG"
-- 
GitLab


From 2f1cde8a57d19bae689a7b9d28058b6b23838b48 Mon Sep 17 00:00:00 2001
From: Aliaksei Kruk2 <aliaksei_kruk2@epam.com>
Date: Thu, 26 May 2022 11:53:47 +0300
Subject: [PATCH 4/4] gcr images with tag

---
 .gitlab-ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a281877f..c0c2a14d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,11 +33,10 @@ devel-container-gcr:
   before_script:
   - cat $OSDU_GCP_DEPLOY_FILE | docker login -u _json_key --password-stdin https://gcr.io
   script:
-  - docker build --tag $OSDU_GCP_GCR_REGISTRY/$OSDU_GCP_IMAGE_PATH:$CI_COMMIT_REF_SLUG --file docker/alpine-gitlab-ci.Dockerfile .
-  - docker push $OSDU_GCP_GCR_REGISTRY/$OSDU_GCP_IMAGE_PATH:$CI_COMMIT_REF_SLUG
+  - docker build --tag $OSDU_GCP_GCR_REGISTRY/$OSDU_GCP_IMAGE_PATH:$CI_COMMIT_TAG --file docker/alpine-gitlab-ci.Dockerfile .
+  - docker push $OSDU_GCP_GCR_REGISTRY/$OSDU_GCP_IMAGE_PATH:$CI_COMMIT_TAG
   rules:
-  - if: "$OSDU_GCP == 'true'"
-  # - if: "$OSDU_GCP == 'true' && $CI_COMMIT_TAG"
+  - if: "$OSDU_GCP == 'true' && $CI_COMMIT_TAG"
     when: on_success
 devel-container-merge-request:
   stage: prepare
-- 
GitLab