diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2023-03-06 23:18:22 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2023-03-06 23:18:22 +0300 |
| commit | 08ad8ede28f6351d9b8fc160abefc6bd0e6efac1 (patch) | |
| tree | 1487af11270cee27d3c98170b29d9b9074fb61bf | |
| parent | 2a8adc0e2238280c433dafe4d12d4591cb8922ca (diff) | |
| parent | fba9138e188987a83f695e66769abee54c9fbb5e (diff) | |
Merge branch 'simplify-pipeline-rules-1' into 'main'
Remove rules that are not needed
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3609
Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Approved-by: Sarah German <sgerman@gitlab.com>
Approved-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Marcel Amirault <mamirault@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 28 | ||||
| -rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 2 |
3 files changed, 3 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb324826..42a4d328 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,6 +53,8 @@ workflow: variables: DOCS_PROJECT_PIPELINE_TYPE: "Hourly site deployment pipeline" - if: '$CI_PIPELINE_SOURCE == "pipeline"' + variables: + DOCS_PROJECT_PIPELINE_TYPE: "Pipeline source = pipeline" - if: '$CI_PIPELINE_SOURCE == "trigger"' variables: DOCS_PROJECT_PIPELINE_TYPE: "Review app pipeline" diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index c754074e..a19fd98c 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -61,23 +61,6 @@ default: # # Rules to determine which pipelines jobs will run in. # -.rules_scheduled: - rules: - - if: $CHORES_PIPELINE == "true" - when: never - - if: '$CI_PIPELINE_SOURCE != "schedule"' - when: never - - if: '$PIPELINE_SCHEDULE_TIMING == "weekly"' - - if: '$PIPELINE_SCHEDULE_TIMING == "hourly"' - when: manual - allow_failure: true - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - when: manual - allow_failure: true - - if: '$CI_COMMIT_BRANCH == "main"' - when: manual - allow_failure: true - .rules_scheduled_manual: rules: - if: $CHORES_PIPELINE == "true" @@ -104,17 +87,6 @@ default: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' -.rules_global_nav_test: - rules: - - if: $CHORES_PIPELINE == "true" - when: never - - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' - when: never - - if: '$CI_PIPELINE_SOURCE == "schedule"' - - if: '$CI_MERGE_REQUEST_ID' - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' - .rules_prod: rules: - if: $CHORES_PIPELINE == "true" diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index cf238ca0..d921f1b6 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -8,7 +8,7 @@ test_global_nav_links: image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-2a7e4d1c extends: - - .rules_global_nav_test + - .rules_site_tests - .bundle stage: test script: |