diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-06-10 07:20:10 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2023-06-10 07:20:10 +0300 |
| commit | 3b8387a79f9eee004d262352f457da2f738b66f2 (patch) | |
| tree | b78dc49c5aefa60df684f07c5541910e0791f476 | |
| parent | bc6817a9281f74b9647a039be768803eb50b4f4b (diff) | |
| parent | 9ccbea363fa2032b73a31df4ae50db39d1143435 (diff) | |
Merge branch 'leipert-execute-review-earlier' into 'main'
Execute review job earlier
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3952
Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Reviewed-by: Achilleas Pipinellis <axil@gitlab.com>
Reviewed-by: Lukas 'Eipi' Eipert <leipert@gitlab.com>
Co-authored-by: Lukas Eipert <leipert@gitlab.com>
| -rw-r--r-- | .gitlab/ci/build-and-deploy.gitlab-ci.yml | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml index 746802bd..25e311cd 100644 --- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml +++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml @@ -20,6 +20,15 @@ url: https://$CI_COMMIT_REF_SLUG$REVIEW_SLUG.docs.gitlab-review.app on_stop: review_stop auto_stop_in: 30 days + rules: + - if: '$CI_PROJECT_PATH == "gitlab-renovate-forks/gitlab-docs"' + when: manual + - if: '$CI_PROJECT_PATH !~ /^gitlab-org/' + when: never + - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"' + when: never + - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' + - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' # # The script lines for compiling and minifying the site @@ -99,19 +108,15 @@ review: - .retry - .review-environment before_script: [] + needs: + - job: compile_dev + optional: true + - job: compile_upstream_review_app + optional: true cache: {} script: - scripts/review-replace-urls.sh - scripts/deploy-review-app.sh - rules: - - if: '$CI_PROJECT_PATH == "gitlab-renovate-forks/gitlab-docs"' - when: manual - - if: '$CI_PROJECT_PATH !~ /^gitlab-org/' - when: never - - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"' - when: never - - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' # # Stop the Review App @@ -131,20 +136,8 @@ review_stop: cache: {} script: - scripts/deploy-review-app.sh - rules: - - if: '$CI_PROJECT_PATH == "gitlab-renovate-forks/gitlab-docs"' - allow_failure: true - when: manual - - if: '$CI_PROJECT_PATH !~ /^gitlab-org/' - when: never - - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"' - when: never - - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' - allow_failure: true - when: manual - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' - allow_failure: true - when: manual + allow_failure: true + when: manual # # Clean up stopped review app environments. Done once a month in a scheduled pipeline, |