summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-09-21 16:19:24 +0200
committerAchilleas Pipinellis <axil@gitlab.com>2017-09-21 16:19:24 +0200
commit521717f24bf1a66aa794b9c1596ffc7fecfd94fe (patch)
tree3485932d4ee825f05d1144114eb00be80341b8ac
parent356658805765d01e52c7bec934173ffa8aaa6ada (diff)
downloadgitlab-ce-521717f24bf1a66aa794b9c1596ffc7fecfd94fe.tar.gz
Do not clone the repo when running the review-docs jobsdocs/fix-review-docs-cleanup-job
Previously, we checked out the branch and ran the script from there. However, when the MR got merged and the cleanup job was run it would fail since it could not find the now deleted branch. This commit rather downloads the script from GitLab and skips downloading the artifacts/dependencies/cache to speed up the process.
-rw-r--r--.gitlab-ci.yml15
1 files changed, 12 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8f73e4d4d7..ed993abae73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -176,11 +176,20 @@ build-package:
image: ruby:2.4-alpine
before_script:
- gem install gitlab --no-doc
+ # We need to download the script rather than clone the repo since the
+ # review-docs-cleanup job will not be able to run when the branch gets
+ # deleted (when merging the MR).
+ - apk add --update openssl
+ - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/master/scripts/trigger-build-docs
+ - chmod 755 trigger-build-docs
services: []
+ cache: {}
+ dependencies: []
+ artifacts: {}
variables:
SETUP_DB: "false"
USE_BUNDLE_INSTALL: "false"
- cache: {}
+ GIT_STRATEGY: none
when: manual
only:
- branches
@@ -197,7 +206,7 @@ review-docs-deploy:
url: http://preview-$CI_COMMIT_REF_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
on_stop: review-docs-cleanup
script:
- - scripts/trigger-build-docs deploy
+ - ./trigger-build-docs deploy
# Cleanup remote environment of gitlab-docs
review-docs-cleanup:
@@ -207,7 +216,7 @@ review-docs-cleanup:
name: review-docs/$CI_COMMIT_REF_NAME
action: stop
script:
- - scripts/trigger-build-docs cleanup
+ - ./trigger-build-docs cleanup
# Retrieve knapsack and rspec_flaky reports
retrieve-tests-metadata: