From 699c19736faab36acaf1e3e11e7ec86893a2036d Mon Sep 17 00:00:00 2001
From: arshamparity <75425316+arshamparity@users.noreply.github.com>
Date: Tue, 31 Aug 2021 16:11:13 +0300
Subject: [PATCH] Gitlab ci (#390)

* adding values-parity.yaml to the project again

* removing the custom values file

* replacing the namespace with variable

* removing the default configuration for frontend nginx

* fixing the CI
---
 .gitlab-ci.yml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf3088d..2c2cd15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,14 @@
 variables:
-  CONTAINER_REGISTRY:             "docker.io/parity"
-  BACKEND_CONTAINER_REPO:         "substrate-telemetry-backend"
-  FRONTEND_CONTAINER_REPO:        "substrate-telemetry-frontend"
+  BACKEND_CONTAINER_REPO:         "docker.io/parity/substrate-telemetry-backend"
+  FRONTEND_CONTAINER_REPO:        "docker.io/parity/substrate-telemetry-frontend"
+  BACKEND_IMAGE_FULL_NAME:        "${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
+  FRONTEND_IMAGE_FULL_NAME:       "${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
   KUBE_NAMESPACE:                 "substrate-telemetry"
-  BACKEND_IMAGE_FULL_NAME:        "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
-  FRONTEND_IMAGE_FULL_NAME:       "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
 
 stages:
   - dockerize
   - staging
 
-#.delete_deployment:       &delete_deployment
-#  - helm uninstall -n "$KUBE_NAMESPACE" "$KUBE_NAMESPACE"
-
 .dockerize:               &dockerize
   stage:                  dockerize
   image:                  quay.io/buildah/stable
@@ -35,10 +31,10 @@ stages:
         --timeout 120s
         --create-namespace
         --namespace $KUBE_NAMESPACE
-        --set image.backend.repository="${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}"
-        --set image.backend.tag="${CI_COMMIT_SHORT_SHA}"
-        --set image.frontend.repository="${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}"
-        --set image.frontend.tag="${CI_COMMIT_SHORT_SHA}"
+        --set image.backend.repository="${BACKEND_CONTAINER_REPO}"
+        --set image.backend.tag="${CI_COMMIT_SHORT_SHA}-beta"
+        --set image.frontend.repository="${FRONTEND_CONTAINER_REPO}"
+        --set image.frontend.tag="${CI_COMMIT_SHORT_SHA}-beta"
         --values values-parity.yaml
         $KUBE_NAMESPACE parity/substrate-telemetry
   rules:
@@ -56,8 +52,7 @@ dockerize-backend:
       --tag "$BACKEND_IMAGE_FULL_NAME" ./backend/
     - echo ${Docker_Hub_Pass_Parity} |
         buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
-    - |-
-      buildah push --format=v2s2 "$BACKEND_IMAGE_FULL_NAME"
+    - buildah push --format=v2s2 "$BACKEND_IMAGE_FULL_NAME"
 
 dockerize-frontend:
   <<:                     *dockerize
@@ -68,8 +63,7 @@ dockerize-frontend:
       --tag "$FRONTEND_IMAGE_FULL_NAME" ./frontend/
     - echo ${Docker_Hub_Pass_Parity} |
         buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
-    - |-
-      buildah push --format=v2s2 "$FRONTEND_IMAGE_FULL_NAME"
+    - buildah push --format=v2s2 "$FRONTEND_IMAGE_FULL_NAME"
 
 deploy-parity-stg:
   stage:                  staging