summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwalkafwalka <2865898-walkafwalka@users.noreply.gitlab.com>2019-03-11 12:29:51 -0700
committerwalkafwalka <2865898-walkafwalka@users.noreply.gitlab.com>2019-03-12 00:52:50 -0700
commite6dad4f8b78e08061826b89a33bc782e00943141 (patch)
tree6e072c1be8b04a213ce3ff1e93c90eeecd3c6f6d
parentdb266771c4d7b831a3627b7130683878b52b92ab (diff)
downloadgitlab-ce-walkafwalka/gitlab-ce-fix-review-app-env-url.tar.gz
Use project name and id in review app url instead of project path slugwalkafwalka/gitlab-ce-fix-review-app-env-url
-rw-r--r--changelogs/unreleased/fix-review-app-env-url.yml5
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-review-app-env-url.yml b/changelogs/unreleased/fix-review-app-env-url.yml
new file mode 100644
index 00000000000..963cd0c2992
--- /dev/null
+++ b/changelogs/unreleased/fix-review-app-env-url.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes long review app subdomains
+merge_request: 25990
+author: walkafwalka
+type: fixed
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 6c99e20e7af..048eabe234c 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -262,7 +262,7 @@ review:
- persist_environment_url
environment:
name: review/$CI_COMMIT_REF_NAME
- url: http://$CI_PROJECT_PATH_SLUG-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+ url: http://$CI_PROJECT_ID-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
on_stop: stop_review
artifacts:
paths: [environment_url.txt]