From 070a7cef12c1ca9e185b3c8a4caa59c7e3121a38 Mon Sep 17 00:00:00 2001
From: "Danylo Vanin (EPAM)" <danylo_vanin@epam.com>
Date: Wed, 27 Apr 2022 11:21:54 +0000
Subject: [PATCH] [GONRG-4699] Refactor bootstrap pipeline
---
.gitlab-ci.yml | 7 +++----
.../bootstrap/bootstrap_partition.yml | 18 ------------------
2 files changed, 3 insertions(+), 22 deletions(-)
delete mode 100644 provider/partition-gcp/bootstrap/bootstrap_partition.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9838754e..9ab2d9fda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ variables:
IBM_INT_TEST_SUBDIR: testing/partition-test-ibm
# --- osdu gcp specific variables ---
+ OSDU_GCP_ENABLE_BOOTSTRAP: "true"
OSDU_GCP_SERVICE: partition
OSDU_GCP_VENDOR: gcp
OSDU_GCP_APPLICATION_NAME: os-partition
@@ -60,12 +61,10 @@ include:
- project: "osdu/platform/ci-cd-pipelines"
file: "publishing/pages.yml"
- - local: "/provider/partition-gcp/bootstrap/bootstrap_partition.yml"
-
osdu-gcp-deploy-deployment:
variables:
OSDU_GCP_BOOTSTRAP_SERVICE: partition-bootstrap
- needs: ["osdu-gcp-containerize-gitlab", "osdu-gcp-containerize-bootstrap-partition", "osdu-gcp-deploy-configmap"]
+ needs: ["osdu-gcp-containerize-gitlab", "osdu-gcp-containerize-bootstrap-gitlab", "osdu-gcp-deploy-configmap"]
after_script:
- echo ----- Verify Bootstrap -----
- kubectl rollout status deployment.v1.apps/$OSDU_GCP_BOOTSTRAP_SERVICE -n $OSDU_GCP_HELM_NAMESPACE --timeout=900s
@@ -78,7 +77,7 @@ osdu-gcp-dev2-deploy-deployment:
variables:
OSDU_GCP_BOOTSTRAP_SERVICE: partition-bootstrap
OSDU_GCP_BOOTSTRAP_SERVICE_ACCOUNT: workload-gke-bootstrap-sa
- needs: ["osdu-gcp-containerize-gitlab", "osdu-gcp-containerize-bootstrap-partition", "osdu-gcp-dev2-deploy-configmap"]
+ needs: ["osdu-gcp-containerize-gitlab", "osdu-gcp-containerize-bootstrap-gitlab", "osdu-gcp-dev2-deploy-configmap"]
after_script:
- echo ----- Verify Bootstrap -----
- kubectl rollout status deployment.v1.apps/$OSDU_GCP_BOOTSTRAP_SERVICE -n $OSDU_GCP_HELM_NAMESPACE --timeout=900s
diff --git a/provider/partition-gcp/bootstrap/bootstrap_partition.yml b/provider/partition-gcp/bootstrap/bootstrap_partition.yml
deleted file mode 100644
index fae6866ee..000000000
--- a/provider/partition-gcp/bootstrap/bootstrap_partition.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-osdu-gcp-containerize-bootstrap-partition:
- stage: containerize
- needs: ["compile-and-unit-test"]
- image: docker:19.03.15
- tags: ["osdu-small"]
- services:
- - docker:20.10.7-dind
- variables:
- IMAGE_NAME: osdu-gcp-bootstrap-partition
- script:
- # Gitlab Container Registry
- - export EXTRA_DOCKER_TAG=""; if [ "$CI_COMMIT_TAG" != "" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_TAG" ; elif [ "$CI_COMMIT_REF_NAME" = "master" ] ; then EXTRA_DOCKER_TAG="-t $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" ; fi
- - docker build -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $EXTRA_DOCKER_TAG --file provider/partition-gcp/bootstrap/Dockerfile .
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME
- rules:
- - if: "$OSDU_GCP == 'true'"
- when: on_success
--
GitLab