diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-03-13 15:22:00 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-03-13 15:22:00 +0000 |
| commit | 7c2f1ab3e0d98f75e5b348d61e4056ba4b919953 (patch) | |
| tree | 087664d62eb3a2d0499e5639526bc0e5a7401c2f | |
| parent | 5902b9be458d971ce653351fc32652bc47c8d00c (diff) | |
| parent | 7f0f752aab23d26f9db67ec016107e647c86b3e3 (diff) | |
| download | gitlab-ce-7c2f1ab3e0d98f75e5b348d61e4056ba4b919953.tar.gz | |
Merge branch 'fix-review-app-env-url' into 'master'
Use project name and ID in Review App environment URLs instead of the project path slug
Closes #52990
See merge request gitlab-org/gitlab-ce!25990
| -rw-r--r-- | changelogs/unreleased/fix-review-app-env-url.yml | 5 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 6 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
3 files changed, 9 insertions, 4 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/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 24fd4d70b9f..758b8b3f4ee 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -442,10 +442,10 @@ process. Auto Review Apps create a Review App for each branch. Auto Review Apps will deploy your app to your Kubernetes cluster only. When no cluster is available, no deployment will occur. -The Review App will have a unique URL based on the project name, the branch +The Review App will have a unique URL based on the project ID, the branch or tag name, and a unique number, combined with the Auto DevOps base domain. For -example, `user-project-branch-1234.example.com`. A link to the Review App shows -up in the merge request widget for easy discovery. When the branch is deleted, +example, `13083-review-project-branch-123456.example.com`. A link to the Review App shows +up in the merge request widget for easy discovery. When the branch or tag is deleted, for example after the merge request is merged, the Review App will automatically be deleted. diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 3c46eb36cdb..cb9b1484dc2 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] |