diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-18 16:15:43 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-18 16:15:43 +0300 |
| commit | b479ddc769c2a0c3235cdae7184f1a5a4e9815c7 (patch) | |
| tree | 3d1e03bb7e7927cf57bc21634d69cd864a7cfe8b /.gitlab-ci.yml | |
| parent | 178514e0ee6d71aff642bf80794fc1486f243d72 (diff) | |
| parent | bcde76eeb66169e8cfc985b416c3db21107f328f (diff) | |
Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'
Use MR IID in Review Apps slug and domain
See merge request gitlab-org/gitlab-ce!24388
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68dea56a67d..099a3bb5259 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: @@ -953,8 +953,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: |