summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-01-21 08:13:38 +0000
committerShinya Maeda <shinya@gitlab.com>2019-01-21 18:23:49 +0900
commit11961f05eca99ac35dafb8bd03fbe7db9cb53a49 (patch)
tree8756c7b303a6e66feca3dd16559cdf700c051380 /.gitlab-ci.yml
parent764f26785a0af9aaa472537e56386ffd5ce3d875 (diff)
downloadgitlab-ce-11961f05eca99ac35dafb8bd03fbe7db9cb53a49.tar.gz
Revert "Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'"
This reverts merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24388
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 099a3bb5259..68dea56a67d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -434,12 +434,12 @@ setup-test-env:
cache: {}
dependencies: []
environment: &review-environment
- name: review/mr-${CI_MERGE_REQUEST_IID}
- url: https://gitlab-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}
+ name: review/${CI_COMMIT_REF_NAME}
+ url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
only:
refs:
- - merge_requests@gitlab-org/gitlab-ce
- - merge_requests@gitlab-org/gitlab-ee
+ - branches@gitlab-org/gitlab-ce
+ - branches@gitlab-org/gitlab-ee
kubernetes: active
except:
refs:
@@ -953,8 +953,8 @@ review-deploy:
allow_failure: true
variables:
GIT_DEPTH: "1"
- HOST_SUFFIX: "mr-${CI_MERGE_REQUEST_IID}"
- DOMAIN: "-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}"
+ HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
+ DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF: "master"
API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
environment: