From b3b343274145bb27b9b59cca73e58d0686bb438f Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Fri, 6 May 2022 17:53:53 +0200
Subject: [PATCH] fixed environment name
---
.gitlab-ci.yml | 1 -
.gitlab/ci/deploy.yml | 18 +++++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d9032643..1080e0159 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ workflow:
rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" && ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH)
variables:
- DEPLOY_ENVIRONMENT: "review/${CI_COMMIT_REF_SLUG}"
DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_REF_SLUG-composer
DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_REF_SLUG
DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_REF_SLUG
diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml
index d362ebd27..3a2a849f2 100644
--- a/.gitlab/ci/deploy.yml
+++ b/.gitlab/ci/deploy.yml
@@ -1,8 +1,16 @@
-deploy:
+.deploy:
stage: deploy
- environment:
- name: $DEPLOY_ENVIRONMENT
image: alpine/k8s:1.22.6
script:
- - printenv
- - kubectl -n $KUBE_NAMESPACE get pods
\ No newline at end of file
+ - kubectl -n $KUBE_NAMESPACE get pods
+
+deploy_review:
+ extends:
+ - .deploy
+ variables:
+ environment:
+ name: review/$CI_COMMIT_REF_SLUG
+ rules:
+ - if: '$CI_COMMIT_BRANCH != "master" || $CI_COMMIT_BRANCH == "development"'
+ when: never
+ - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH'
\ No newline at end of file
--
GitLab