Commit 7c2f1ab3 authored by Douwe Maan's avatar Douwe Maan

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
parents 5902b9be 7f0f752a
---
title: Fixes long review app subdomains
merge_request: 25990
author: walkafwalka
type: fixed
...@@ -442,10 +442,10 @@ process. Auto Review Apps create a Review App for each branch. ...@@ -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 Auto Review Apps will deploy your app to your Kubernetes cluster only. When no cluster
is available, no deployment will occur. 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 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 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 is deleted, 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 for example after the merge request is merged, the Review App will automatically
be deleted. be deleted.
......
...@@ -262,7 +262,7 @@ review: ...@@ -262,7 +262,7 @@ review:
- persist_environment_url - persist_environment_url
environment: environment:
name: review/$CI_COMMIT_REF_NAME 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 on_stop: stop_review
artifacts: artifacts:
paths: [environment_url.txt] paths: [environment_url.txt]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment