From 80c10b2a4b05e519144cdd811bae5eef7f898056 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 11 Jul 2023 16:18:21 +0100 Subject: [PATCH] ci: split farm rules out of test-source-dep.yml That file has become a bit of the new `.gitlab-ci.yml` with just about everything in there, but a lot of its content doesn't need to be in the same file anymore now that `!reference` exists. Signed-off-by: Eric Engestrom Part-of: --- .gitlab-ci.yml | 1 + .gitlab-ci/farm-rules.yml | 177 +++++++++++++++++++++++++++++++++ .gitlab-ci/test-source-dep.yml | 171 ------------------------------- 3 files changed, 178 insertions(+), 171 deletions(-) create mode 100644 .gitlab-ci/farm-rules.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa8caf6af12..672544ba980 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,7 @@ include: - local: '.gitlab-ci/container/gitlab-ci.yml' - local: '.gitlab-ci/build/gitlab-ci.yml' - local: '.gitlab-ci/test/gitlab-ci.yml' + - local: '.gitlab-ci/farm-rules.yml' - local: '.gitlab-ci/test-source-dep.yml' - local: 'docs/gitlab-ci.yml' - local: 'src/amd/ci/gitlab-ci.yml' diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml new file mode 100644 index 00000000000..f831224feb5 --- /dev/null +++ b/.gitlab-ci/farm-rules.yml @@ -0,0 +1,177 @@ +.microsoft-farm-rules: + rules: + - exists: [ .ci-farms-disabled/microsoft ] # 1. Is disabled, never run + when: never + - changes: [ .ci-farms-disabled/microsoft ] # 2. Removed from disabled, run + when: on_success + - changes: [ .ci-farms-disabled/* ] # 3. We touched other farms in MR, do not run + when: never + # 4. Fall-through (other rules or on_success) + +.microsoft-farm-manual-rules: + rules: + # Allow triggering jobs manually in other cases if any files affecting the + # pipeline were changed + - exists: [ .ci-farms-disabled/microsoft ] + when: never + - changes: [ .ci-farms-disabled/microsoft ] + when: never + - !reference [.microsoft-farm-rules, rules] + +.microsoft-farm-container-rules: + rules: + # Allow triggering jobs manually in other cases if any files affecting the + # pipeline were changed + - exists: [ .ci-farms-disabled/microsoft ] + when: never + - changes: [ .ci-farms-disabled/microsoft ] + when: manual + - !reference [.microsoft-farm-rules, rules] + + +.collabora-farm-rules: + rules: + - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' + exists: [ .ci-farms-disabled/collabora ] + when: never + - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' + changes: [ .ci-farms-disabled/collabora ] + when: on_success + - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' + changes: [ .ci-farms-disabled/* ] + when: never + +.collabora-farm-manual-rules: + rules: + - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' + exists: [ .ci-farms-disabled/collabora ] + when: never + - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' + changes: [ .ci-farms-disabled/collabora ] + when: never + - !reference [.collabora-farm-rules, rules] + + +.igalia-farm-rules: + rules: + - exists: [ .ci-farms-disabled/igalia ] + when: never + - changes: [ .ci-farms-disabled/igalia ] + when: on_success + - changes: [ .ci-farms-disabled/* ] + when: never + +.igalia-farm-manual-rules: + rules: + - exists: [ .ci-farms-disabled/igalia ] + when: never + - changes: [ .ci-farms-disabled/igalia ] + when: never + - !reference [.igalia-farm-rules, rules] + + +.lima-farm-rules: + rules: + - exists: [ .ci-farms-disabled/lima ] + when: never + - changes: [ .ci-farms-disabled/lima ] + when: on_success + - changes: [ .ci-farms-disabled/* ] + when: never + +.lima-farm-manual-rules: + rules: + - exists: [ .ci-farms-disabled/lima ] + when: never + - changes: [ .ci-farms-disabled/lima ] + when: never + - !reference [.lima-farm-rules, rules] + + +.anholt-farm-rules: + rules: + - exists: [ .ci-farms-disabled/anholt ] + when: never + - changes: [ .ci-farms-disabled/anholt ] + when: on_success + - changes: [ .ci-farms-disabled/* ] + when: never + +.anholt-farm-manual-rules: + rules: + - exists: [ .ci-farms-disabled/anholt ] + when: never + - changes: [ .ci-farms-disabled/anholt ] + when: never + - !reference [.anholt-farm-rules, rules] + + +.valve-farm-rules: + rules: + - exists: [ .ci-farms-disabled/valve-mupuf ] + if: '$RUNNER_FARM_LOCATION == "mupuf"' + when: never + - exists: [ .ci-farms-disabled/valve-kws ] + if: '$RUNNER_FARM_LOCATION == "keywords"' + when: never + - changes: [ .ci-farms-disabled/valve-mupuf ] + if: '$RUNNER_FARM_LOCATION == "mupuf"' + when: on_success + - changes: [ .ci-farms-disabled/valve-kws ] + if: '$RUNNER_FARM_LOCATION == "keywords"' + when: on_success + - changes: [ .ci-farms-disabled/* ] + when: never + +.valve-farm-manual-rules: + rules: + - exists: [ .ci-farms-disabled/valve-mupuf ] + if: '$RUNNER_FARM_LOCATION == "mupuf"' + when: never + - exists: [ .ci-farms-disabled/valve-kws ] + if: '$RUNNER_FARM_LOCATION == "keywords"' + when: never + - changes: [ .ci-farms-disabled/valve-mupuf ] + if: '$RUNNER_FARM_LOCATION == "mupuf"' + when: never + - changes: [ .ci-farms-disabled/valve-kws ] + if: '$RUNNER_FARM_LOCATION == "keywords"' + when: never + - !reference [.valve-farm-rules, rules] + + +.austriancoder-farm-rules: + rules: + - exists: [ .ci-farms-disabled/austriancoder ] + when: never + - changes: [ .ci-farms-disabled/austriancoder ] + when: on_success + - changes: [ .ci-farms-disabled/* ] + when: never + +.austriancoder-farm-manual-rules: + rules: + - exists: [ .ci-farms-disabled/austriancoder ] + when: never + - changes: [ .ci-farms-disabled/austriancoder ] + when: never + - !reference [.austriancoder-farm-rules, rules] + + +.freedreno-farm-rules: + rules: + - exists: [ .ci-farms-disabled/freedreno ] + when: never + - changes: [ .ci-farms-disabled/freedreno ] + when: on_success + - changes: [ .ci-farms-disabled/* ] + when: never + +.freedreno-farm-manual-rules: + rules: + - exists: [ .ci-farms-disabled/freedreno ] + when: never + - changes: [ .ci-farms-disabled/freedreno ] + when: never + - !reference [.freedreno-farm-rules, rules] + diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 29d4f192b30..4d10ec468ed 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -268,177 +268,6 @@ - src/gallium/frontends/rusticl/**/* when: on_success -# Farm rules -.microsoft-farm-rules: - rules: - - exists: [ .ci-farms-disabled/microsoft ] # 1. Is disabled, never run - when: never - - changes: [ .ci-farms-disabled/microsoft ] # 2. Removed from disabled, run - when: on_success - - changes: [ .ci-farms-disabled/* ] # 3. We touched other farms in MR, do not run - when: never - # 4. Fall-through (other rules or on_success) - -.microsoft-farm-manual-rules: - rules: - # Allow triggering jobs manually in other cases if any files affecting the - # pipeline were changed - - exists: [ .ci-farms-disabled/microsoft ] - when: never - - changes: [ .ci-farms-disabled/microsoft ] - when: never - - !reference [.microsoft-farm-rules, rules] - -.microsoft-farm-container-rules: - rules: - # Allow triggering jobs manually in other cases if any files affecting the - # pipeline were changed - - exists: [ .ci-farms-disabled/microsoft ] - when: never - - changes: [ .ci-farms-disabled/microsoft ] - when: manual - - !reference [.microsoft-farm-rules, rules] - -.collabora-farm-rules: - rules: - - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - exists: [ .ci-farms-disabled/collabora ] - when: never - - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - changes: [ .ci-farms-disabled/collabora ] - when: on_success - - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - changes: [ .ci-farms-disabled/* ] - when: never - -.collabora-farm-manual-rules: - rules: - - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - exists: [ .ci-farms-disabled/collabora ] - when: never - - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - changes: [ .ci-farms-disabled/collabora ] - when: never - - !reference [.collabora-farm-rules, rules] - -.igalia-farm-rules: - rules: - - exists: [ .ci-farms-disabled/igalia ] - when: never - - changes: [ .ci-farms-disabled/igalia ] - when: on_success - - changes: [ .ci-farms-disabled/* ] - when: never - -.igalia-farm-manual-rules: - rules: - - exists: [ .ci-farms-disabled/igalia ] - when: never - - changes: [ .ci-farms-disabled/igalia ] - when: never - - !reference [.igalia-farm-rules, rules] - -.lima-farm-rules: - rules: - - exists: [ .ci-farms-disabled/lima ] - when: never - - changes: [ .ci-farms-disabled/lima ] - when: on_success - - changes: [ .ci-farms-disabled/* ] - when: never - -.lima-farm-manual-rules: - rules: - - exists: [ .ci-farms-disabled/lima ] - when: never - - changes: [ .ci-farms-disabled/lima ] - when: never - - !reference [.lima-farm-rules, rules] - -.anholt-farm-rules: - rules: - - exists: [ .ci-farms-disabled/anholt ] - when: never - - changes: [ .ci-farms-disabled/anholt ] - when: on_success - - changes: [ .ci-farms-disabled/* ] - when: never - -.anholt-farm-manual-rules: - rules: - - exists: [ .ci-farms-disabled/anholt ] - when: never - - changes: [ .ci-farms-disabled/anholt ] - when: never - - !reference [.anholt-farm-rules, rules] - -.valve-farm-rules: - rules: - - exists: [ .ci-farms-disabled/valve-mupuf ] - if: '$RUNNER_FARM_LOCATION == "mupuf"' - when: never - - exists: [ .ci-farms-disabled/valve-kws ] - if: '$RUNNER_FARM_LOCATION == "keywords"' - when: never - - changes: [ .ci-farms-disabled/valve-mupuf ] - if: '$RUNNER_FARM_LOCATION == "mupuf"' - when: on_success - - changes: [ .ci-farms-disabled/valve-kws ] - if: '$RUNNER_FARM_LOCATION == "keywords"' - when: on_success - - changes: [ .ci-farms-disabled/* ] - when: never - -.valve-farm-manual-rules: - rules: - - exists: [ .ci-farms-disabled/valve-mupuf ] - if: '$RUNNER_FARM_LOCATION == "mupuf"' - when: never - - exists: [ .ci-farms-disabled/valve-kws ] - if: '$RUNNER_FARM_LOCATION == "keywords"' - when: never - - changes: [ .ci-farms-disabled/valve-mupuf ] - if: '$RUNNER_FARM_LOCATION == "mupuf"' - when: never - - changes: [ .ci-farms-disabled/valve-kws ] - if: '$RUNNER_FARM_LOCATION == "keywords"' - when: never - - !reference [.valve-farm-rules, rules] - -.austriancoder-farm-rules: - rules: - - exists: [ .ci-farms-disabled/austriancoder ] - when: never - - changes: [ .ci-farms-disabled/austriancoder ] - when: on_success - - changes: [ .ci-farms-disabled/* ] - when: never - -.austriancoder-farm-manual-rules: - rules: - - exists: [ .ci-farms-disabled/austriancoder ] - when: never - - changes: [ .ci-farms-disabled/austriancoder ] - when: never - - !reference [.austriancoder-farm-rules, rules] - -.freedreno-farm-rules: - rules: - - exists: [ .ci-farms-disabled/freedreno ] - when: never - - changes: [ .ci-farms-disabled/freedreno ] - when: on_success - - changes: [ .ci-farms-disabled/* ] - when: never - -.freedreno-farm-manual-rules: - rules: - - exists: [ .ci-farms-disabled/freedreno ] - when: never - - changes: [ .ci-farms-disabled/freedreno ] - when: never - - !reference [.freedreno-farm-rules, rules] - # Rules for changes that impact either freedreno or turnip. .freedreno-common-rules: rules: