Skip to content
Snippets Groups Projects
Commit c425ec8a authored by Evan Read's avatar Evan Read
Browse files

Merge branch 'docs-review-apps-typo' into 'master'

Fix docs review apps in omnibus

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6474



Merged-by: default avatarEvan Read <eread@gitlab.com>
Approved-by: default avatarEvan Read <eread@gitlab.com>
Co-authored-by: default avatarMarcel Amirault <mamirault@gitlab.com>
parents 2cb8f28d 61a6a85e
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!87Merged upstream 15.6.0+ce.0 with adaptations into heptapod branch
......@@ -219,7 +219,9 @@
- chmod 755 trigger-build.rb
variables:
GIT_STRATEGY: none
DOCS_REVIEW_APPS_DOMAIN: docs.gitlab-review-app
DOCS_REVIEW_APPS_DOMAIN: docs.gitlab-review.app
# By default, deploy the Review App using the `main` branch of the `gitlab-org/gitlab-docs` project
DOCS_BRANCH: main
allow_failure: true
rules:
- if: '$PIPELINE_TYPE == "GITLAB_BRANCH_TEST_PIPELINE"'
......@@ -361,7 +363,7 @@
extends:
- .review-docs
environment:
name: review-docs/branch-${CI_COMMIT_REF_SLUG}
name: review-docs/mr-${CI_MERGE_REQUEST_IID}
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables
# Discussion: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/14236/diffs#note_40140693
auto_stop_in: 2 weeks
......@@ -365,7 +367,7 @@
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables
# Discussion: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/14236/diffs#note_40140693
auto_stop_in: 2 weeks
url: http://${DOCS_BRANCH}-${DOCS_GITLAB_REPO_SUFFIX}-${CI_COMMIT_REF_SLUG}.${DOCS_REVIEW_APPS_DOMAIN}/${DOCS_GITLAB_REPO_SUFFIX}
url: https://${DOCS_BRANCH}-${DOCS_GITLAB_REPO_SUFFIX}-${CI_MERGE_REQUEST_IID}.${DOCS_REVIEW_APPS_DOMAIN}/${DOCS_GITLAB_REPO_SUFFIX}
on_stop: review-docs-cleanup
script:
- ./trigger-build.rb docs deploy
......@@ -375,7 +377,7 @@
extends:
- .review-docs
environment:
name: review-docs/branch-${CI_COMMIT_REF_SLUG}
name: review-docs/mr-${CI_MERGE_REQUEST_IID}
action: stop
script:
- ./trigger-build.rb docs cleanup
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment