diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-17 13:55:38 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-17 14:07:06 +0100 |
| commit | 4756720923241a9e06fcb1c47110fdcad23bb8d9 (patch) | |
| tree | b5d20d4975f832320722709d4ff30ace0e1c7e1e | |
| parent | 69dd59aec9e5f8959fa36eb74db28d71aad4212b (diff) | |
| download | gitlab-ce-4756720923241a9e06fcb1c47110fdcad23bb8d9.tar.gz | |
Use slug as the prefix for the docs CI job preview URLdocs/use-slug-as-prefix-in-ci-docs-job
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | scripts/trigger-build-docs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba19d69745c..ff51c4d89ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -193,7 +193,7 @@ review-docs-deploy: name: review-docs/$CI_COMMIT_REF_NAME # DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables # Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693 - url: http://preview-$CI_COMMIT_REF_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX + url: http://$DOCS_GITLAB_REPO_SUFFIX-$CI_COMMIT_REF_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX on_stop: review-docs-cleanup script: - ./trigger-build-docs deploy diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs index 89ad6a99467..a270823b857 100755 --- a/scripts/trigger-build-docs +++ b/scripts/trigger-build-docs @@ -27,7 +27,7 @@ def docs_branch # Prefix the remote branch with 'preview-' in order to avoid # name conflicts in the rare case the branch name already # exists in the docs repo and truncate to max length. - "preview-#{ENV["CI_COMMIT_REF_SLUG"]}"[0...max] + "#{slug}-#{ENV["CI_COMMIT_REF_SLUG"]}"[0...max] end # |