Merge branch 'fix-auto-deploy-templates' into 'master'

Update auto-deploy templates

See merge request !71

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

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

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:

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: