Skip to content

Commit 8db5962

Browse files
Russell Dickensonaxilleaseread
committed
Merge branch 'eread/add-ability-to-create-review-apps-by-using-gitlab-docs-hugo-project' into 'main'
Add ability to create review apps by using the GitLab Docs Hugo project See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/5205 Merged-by: Russell Dickenson <[email protected]> Approved-by: Russell Dickenson <[email protected]> Co-authored-by: Achilleas Pipinellis <[email protected]> Co-authored-by: Evan Read <[email protected]>
2 parents 73d1224 + 88fa153 commit 8db5962

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

.gitlab/ci/docs.gitlab-ci.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ docs:check Kubernetes API docs:
7171
before_script:
7272
- gem install gitlab --no-doc
7373
# We need to download the script rather than clone the repo since the
74-
# review-docs-cleanup job will not be able to run when the branch gets
74+
# review-docs-cleanup and review-docs-hugo-cleanup jobs will not be able to run when the branch gets
7575
# deleted (when merging the MR).
7676
- apk add --update openssl
7777
- wget https://gitlab.com/gitlab-org/gitlab/-/raw/master/scripts/trigger-build.rb
@@ -85,7 +85,7 @@ docs:check Kubernetes API docs:
8585

8686
# Trigger a docs build in gitlab-docs
8787
# Useful to preview the docs changes live
88-
# https://docs.gitlab.com/ee/development/documentation/index.html#previewing-the-changes-live
88+
# https://docs.gitlab.com/ee/development/documentation/review_apps.html
8989
review-docs-deploy:
9090
extends:
9191
- .review-docs
@@ -108,3 +108,27 @@ review-docs-cleanup:
108108
action: stop
109109
script:
110110
- ./trigger-build.rb docs cleanup
111+
112+
# Trigger a docs build in gitlab-docs-hugo
113+
# Useful to preview the docs changes live
114+
# https://docs.gitlab.com/ee/development/documentation/review_apps.html
115+
review-docs-hugo-deploy:
116+
extends:
117+
- .review-docs
118+
environment:
119+
name: review-docs/mr-${CI_MERGE_REQUEST_IID}-hugo
120+
auto_stop_in: 2 weeks
121+
url: https://new.docs.gitlab.com/upstream-review-mr-${DOCS_GITLAB_REPO_SUFFIX}-${CI_MERGE_REQUEST_IID}/${DOCS_GITLAB_REPO_SUFFIX}
122+
on_stop: review-docs-hugo-cleanup
123+
script:
124+
- ./trigger-build.rb docs-hugo deploy
125+
126+
# Cleanup remote environment of gitlab-docs-hugo
127+
review-docs-hugo-cleanup:
128+
extends:
129+
- .review-docs
130+
environment:
131+
name: review-docs/mr-${CI_MERGE_REQUEST_IID}-hugo
132+
action: stop
133+
script:
134+
- ./trigger-build.rb docs-hugo cleanup

docs/executors/ssh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DETAILS:
1212

1313
NOTE:
1414
The SSH executor supports only scripts generated in Bash and the caching feature
15-
is currently not supported.
15+
is not supported.
1616

1717
This is a simple executor that allows you to execute builds on a remote machine
1818
by executing commands over SSH.

0 commit comments

Comments
 (0)