KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Pull out farm disables to a reused rule. 

Reviewed-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Acked-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17287>
This commit is contained in:
Emma Anholt 2022-06-28 12:37:54 -07:00 committed by Marge Bot
parent 5cc71ac75f
commit 1ffb15ae72
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
.gitlab-ci/test-source-dep.yml
View File

@ -151,13 +151,22 @@
when: on_success when: on_success
- when: never - when: never
.freedreno-rules: .collabora-farm-rules:
stage: freedreno rules:
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
# Skips freedreno jobs if either of the farms we use are offline.
.freedreno-farm-rules:
rules: rules:
- if: '$FD_FARM == "offline"' - if: '$FD_FARM == "offline"'
when: never when: never
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
.freedreno-rules:
stage: freedreno
rules:
- !reference [.freedreno-farm-rules, rules]
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
@ -183,10 +192,7 @@
.freedreno-rules-restricted: .freedreno-rules-restricted:
stage: freedreno stage: freedreno
rules: rules:
- if: '$FD_FARM == "offline"' - !reference [.freedreno-farm-rules, rules]
when: never
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
# If the triggerer has access to the restricted traces and if it is pre-merge # If the triggerer has access to the restricted traces and if it is pre-merge
- if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias)$/") && - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias)$/") &&
($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)' ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
@ -211,10 +217,7 @@
.freedreno-rules-performance: .freedreno-rules-performance:
stage: freedreno stage: freedreno
rules: rules:
- if: '$FD_FARM == "offline"' - !reference [.freedreno-farm-rules, rules]
when: never
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
# Run only on pre-merge pipelines from Marge # Run only on pre-merge pipelines from Marge
- if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH' - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
@ -255,8 +258,7 @@
stage: arm stage: arm
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -283,8 +285,7 @@
stage: arm stage: arm
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -382,8 +383,7 @@
stage: amd stage: amd
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -418,8 +418,7 @@
stage: layered-backends stage: layered-backends
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
# Run only on pre-merge pipelines from Marge # Run only on pre-merge pipelines from Marge
- if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH' - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
when: never when: never
@ -441,8 +440,7 @@
stage: amd stage: amd
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -465,8 +463,7 @@
stage: amd stage: amd
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -519,8 +516,7 @@
stage: intel stage: intel
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -540,8 +536,7 @@
stage: intel stage: intel
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
# Run only on pre-merge pipelines from Marge # Run only on pre-merge pipelines from Marge
- if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH' - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
when: never when: never
@ -560,8 +555,7 @@
stage: intel stage: intel
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -577,8 +571,7 @@
stage: intel stage: intel
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/' - !reference [.collabora-farm-rules, rules]
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success