diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-26 12:14:42 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-26 12:14:42 -0500 |
| commit | b4af546820b00537c6a5053f6b21dc9805dc11c7 (patch) | |
| tree | 505745bec506be527c7a0e940b754b0960c77167 /.gitlab-ci.yml | |
| parent | 7fb477325eb7f1215a6ae128c9a3a300606d7fbe (diff) | |
| parent | 3b2d68d37d39047e25fbe0ae51cafa39f22805f8 (diff) | |
| download | gitlab-ce-b4af546820b00537c6a5053f6b21dc9805dc11c7.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to '.gitlab-ci.yml')
| -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 514c68eac80..eabe3423f2f 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: |