diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-03-10 03:21:51 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2023-03-10 03:21:51 +0300 |
| commit | d7578692fbfd086c62b722c475aaafafd26957c6 (patch) | |
| tree | 23ac80a9602b0a8eed94fbfa36938db45ce73a16 /.gitlab | |
| parent | 34548ffa2fbc370375ed4536c52b14a359f0dac7 (diff) | |
Final cleanup of pipeline code
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/build-and-deploy.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml index a61648bc..13b0344b 100644 --- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml +++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml @@ -117,7 +117,6 @@ review: when: never - 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 # # Stop the Review App @@ -149,10 +148,6 @@ review_stop: - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' allow_failure: true when: manual - # TODO: Remove once no projects create such branch - - if: '$CI_COMMIT_BRANCH =~ /docs-preview/' - allow_failure: true - when: manual # # Clean up stopped review app environments. Done once a month in a scheduled pipeline, diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 30a3fb13..0225fc01 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -96,7 +96,6 @@ default: .rules_dev: rules: - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' - - if: '$CI_COMMIT_BRANCH =~ /docs-preview/' # TODO: Remove once no projects create such branch - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"' .rules_upstream_review_app: @@ -105,8 +104,5 @@ default: .rules_pages: rules: - # Don't deploy to production for trigerred pipelines (usually review apps) - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' - when: never - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Hourly site deployment pipeline"' - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"' |