diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-22 06:21:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-22 06:21:30 +0000 |
| commit | f357fc7d2c1f3898b1ce0df7f97665aa8230d05e (patch) | |
| tree | 0b8498fe2de4ec009837151a4f590de6f9e60822 | |
| parent | 97667028dd14e91d163aef5c0de8a60e6abf4a56 (diff) | |
| parent | 521717f24bf1a66aa794b9c1596ffc7fecfd94fe (diff) | |
| download | gitlab-ce-f357fc7d2c1f3898b1ce0df7f97665aa8230d05e.tar.gz | |
Merge branch 'docs/fix-review-docs-cleanup-job' into 'master'
Do not clone the repo when running the review-docs jobs
See merge request gitlab-org/gitlab-ce!14420
| -rw-r--r-- | .gitlab-ci.yml | 15 |
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: |