diff options
| author | walkafwalka <2865898-walkafwalka@users.noreply.gitlab.com> | 2019-03-11 12:29:51 -0700 |
|---|---|---|
| committer | walkafwalka <2865898-walkafwalka@users.noreply.gitlab.com> | 2019-03-12 18:11:28 -0700 |
| commit | 7f0f752aab23d26f9db67ec016107e647c86b3e3 (patch) | |
| tree | afb02113b69e34af13b75e53f9915bb852568bdc | |
| parent | e17074139e0c6d91076fc775e50c44d45f956b1f (diff) | |
| download | gitlab-ce-7f0f752aab23d26f9db67ec016107e647c86b3e3.tar.gz | |
Use project name and id in review app url instead of project path slug
| -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] |