summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-01-15 12:28:34 +0100
committerRémy Coutable <remy@rymai.me>2019-01-15 14:53:12 +0100
commitbcde76eeb66169e8cfc985b416c3db21107f328f (patch)
tree170b444c32f471c35a73f182bbda6f7059abc3c8 /.gitlab-ci.yml
parent11d6c7e2f852536c9a05fe3fdf7e82be7d38f96e (diff)
downloadgitlab-ce-bcde76eeb66169e8cfc985b416c3db21107f328f.tar.gz
Use MR IID in Review Apps slug and domain
Signed-off-by: Rémy Coutable <remy@rymai.me>
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 6cbc8e21c76..6960bdef13e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -434,12 +434,12 @@ setup-test-env:
cache: {}
dependencies: []
environment: &review-environment
- name: review/${CI_COMMIT_REF_NAME}
- url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
+ name: review/mr-${CI_MERGE_REQUEST_IID}
+ url: https://gitlab-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}
only:
refs:
- - branches@gitlab-org/gitlab-ce
- - branches@gitlab-org/gitlab-ee
+ - merge_requests@gitlab-org/gitlab-ce
+ - merge_requests@gitlab-org/gitlab-ee
kubernetes: active
except:
refs:
@@ -937,8 +937,8 @@ review-deploy:
allow_failure: true
variables:
GIT_DEPTH: "1"
- HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
- DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
+ HOST_SUFFIX: "mr-${CI_MERGE_REQUEST_IID}"
+ DOMAIN: "-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF: "master"
API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
environment: