diff options
Diffstat (limited to '.gitlab/ci/build-and-deploy.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/build-and-deploy.gitlab-ci.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml index 5028214c..a61648bc 100644 --- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml +++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml @@ -115,8 +115,8 @@ review: when: manual - if: '$CI_PROJECT_PATH !~ /^gitlab-org/' when: never - - if: '$CI_MERGE_REQUEST_ID' - - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' + - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' + - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' - if: '$CI_COMMIT_BRANCH =~ /docs-preview/' # TODO: Remove once no projects create such branch # @@ -143,7 +143,10 @@ review_stop: when: manual - if: '$CI_PROJECT_PATH !~ /^gitlab-org/' when: never - - if: '$CI_MERGE_REQUEST_ID || $CI_PIPELINE_SOURCE == "pipeline"|| $CI_PIPELINE_SOURCE == "trigger"' + - 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 # TODO: Remove once no projects create such branch @@ -161,7 +164,7 @@ delete_stopped_environments: before_script: [] dependencies: [] rules: - - if: $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE_SCHEDULE_TIMING == "monthly" + - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Monthly stopped environments cleanup pipeline"' stage: test script: - apk --update add curl jq |