From 218a098d0eedc8f8f7ac8f8b252701a47513907e Mon Sep 17 00:00:00 2001
From: Dobromir Palushev <dobromir@peaksandpies.com>
Date: Sat, 3 Sep 2022 18:04:09 +0200
Subject: [PATCH] pipeline updates for the main branch
---
.gitlab-ci.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57a8301..b73d4cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
workflow:
rules:
- - if: >-
- $CI_COMMIT_BRANCH == "staging" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: '$CI_COMMIT_BRANCH == "staging" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
when: always
- when: never
@@ -130,7 +129,7 @@ deploy-image:
variables:
ENVIRONMENT_NAME: 'staging'
STATIC_IP: 'staging-todoapp-ip'
- - if: $CI_COMMIT_REF_NAME !~ /main/
+ - if: $CI_COMMIT_REF_NAME =~ /main/
when: 'always'
variables:
ENVIRONMENT_NAME: 'production'
@@ -150,6 +149,3 @@ deploy-image:
- kubectl apply -f service.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
- INGRESS_MANIFEST=$(sed -e "s,{{static-ip-name}},${STATIC_IP},g" ./ingress.yaml.tmpl)
- echo "${INGRESS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
-
-
-
--
GitLab