From ec7d6ecba0966b05403c8eef2af9b24fe231a1c5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 20 Apr 2017 14:59:53 +0200
Subject: [PATCH] Update templates to use `CI_COMMIT_REF_NAME` as this is
 correct and remove `CI_ENVIRONMENT_URL` as this is currently read by
 auto-deploy.

---
 OpenShift.gitlab-ci.yml                         |  4 ++--
 autodeploy/Kubernetes-with-canary.gitlab-ci.yml |  4 ++--
 autodeploy/Kubernetes.gitlab-ci.yml             | 10 ++--------
 autodeploy/OpenShift.gitlab-ci.yml              |  4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/OpenShift.gitlab-ci.yml b/OpenShift.gitlab-ci.yml
index d3bb388..636cb0a 100644
--- a/OpenShift.gitlab-ci.yml
+++ b/OpenShift.gitlab-ci.yml
@@ -41,7 +41,7 @@ review:
     APP: $CI_COMMIT_REF_NAME
     APP_HOST: $CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
     on_stop: stop-review
   only:
@@ -59,7 +59,7 @@ stop-review:
     APP: $CI_COMMIT_REF_NAME
     GIT_STRATEGY: none
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   only:
     - branches
diff --git a/autodeploy/Kubernetes-with-canary.gitlab-ci.yml b/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
index ed77fd8..555a51d 100644
--- a/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
+++ b/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
@@ -59,7 +59,7 @@ review:
   script:
     - command deploy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
@@ -74,7 +74,7 @@ stop_review:
   script:
     - command destroy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   allow_failure: true
diff --git a/autodeploy/Kubernetes.gitlab-ci.yml b/autodeploy/Kubernetes.gitlab-ci.yml
index 9312bff..ee830ec 100644
--- a/autodeploy/Kubernetes.gitlab-ci.yml
+++ b/autodeploy/Kubernetes.gitlab-ci.yml
@@ -23,8 +23,6 @@ build:
 
 production:
   stage: production
-  variables:
-    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
@@ -36,8 +34,6 @@ production:
 
 staging:
   stage: staging
-  variables:
-    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
@@ -48,12 +44,10 @@ staging:
 
 review:
   stage: review
-  variables:
-    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
@@ -68,7 +62,7 @@ stop_review:
   script:
     - command destroy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   only:
diff --git a/autodeploy/OpenShift.gitlab-ci.yml b/autodeploy/OpenShift.gitlab-ci.yml
index 456f3d0..27c9107 100644
--- a/autodeploy/OpenShift.gitlab-ci.yml
+++ b/autodeploy/OpenShift.gitlab-ci.yml
@@ -53,7 +53,7 @@ review:
   script:
     - command deploy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
@@ -68,7 +68,7 @@ stop_review:
   script:
     - command destroy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   only:
-- 
GitLab