diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-03-02 06:23:56 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2023-03-02 06:23:56 +0300 |
| commit | fba9138e188987a83f695e66769abee54c9fbb5e (patch) | |
| tree | 7a1a8d430371f28c91cf0e6d4fb044746ecd029b /.gitlab | |
| parent | 2dbcc3ee3b59aaeba5b76ed6a94288156de5be1d (diff) | |
Remove rules that are not needed
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 28 | ||||
| -rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 2 |
2 files changed, 1 insertions, 29 deletions
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: |