diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-04-20 15:26:31 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-04-20 15:26:31 +0200 |
| commit | b929b80f0c48e72ac8f07f5dbf8729b6821b5852 (patch) | |
| tree | 78ec282b98e825d314b28c87885b6d50b01a67bf | |
| parent | b458d85302d7b6a14bdfbbceda5abed6a7e1a20b (diff) | |
| download | gitlab-ce-zj-update-ci-templates.tar.gz | |
Revert SLUG usage, to use NAMEzj-update-ci-templates
4 files changed, 8 insertions, 14 deletions
diff --git a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml index d3bb388a1e7..636cb0a9a99 100644 --- a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/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/vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml index ed77fd866e7..555a51d35b9 100644 --- a/vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/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/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml index 9312bff594a..ee830ec2eb0 100644 --- a/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/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/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml index 456f3d0a63f..27c9107e0d7 100644 --- a/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/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: |