diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-05 11:07:15 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-05 11:07:15 +0000 |
| commit | 715f5de4aa0f1c8d32eecfd54b6610bf8eb67c76 (patch) | |
| tree | 231d09f1da3eeee3f558cb6802ddf2344ab01fdc | |
| parent | ff76ca44945766f3633e348c8bd78eb6439fc249 (diff) | |
| parent | 399087c8dbad4faba2702dbcbce816c693db4015 (diff) | |
| download | gitlab-ce-715f5de4aa0f1c8d32eecfd54b6610bf8eb67c76.tar.gz | |
Merge branch 'review-app-stop' into 'master'
Fix docs review-app stages in the pipeline
See merge request gitlab-org/gitlab-ce!31464
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/docs.gitlab-ci.yml | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b39304444c..9086da10283 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,6 @@ stages: - qa - post-test - pages - - post-cleanup include: - local: .gitlab/ci/global.gitlab-ci.yml diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 5a3940bdac2..39ae62a43c9 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -15,7 +15,7 @@ review-docs-deploy-manual: extends: - .review-docs - .no-docs-and-no-qa - stage: build + stage: review script: - gem install gitlab --no-document - ./$SCRIPT_NAME deploy @@ -28,7 +28,7 @@ review-docs-deploy-manual: # Useful to preview the docs changes live. review-docs-deploy: <<: *review-docs - stage: post-test + stage: review script: - gem install gitlab --no-document - ./$SCRIPT_NAME deploy @@ -41,7 +41,7 @@ review-docs-deploy: # Cleanup remote environment of gitlab-docs review-docs-cleanup: <<: *review-docs - stage: post-cleanup + stage: review environment: name: review-docs/$CI_COMMIT_REF_SLUG action: stop |