OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: rename "freedreno" farm to "google-freedreno"

Browse Source 
There are 3 freedreno farms: google, collabora, and valve.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31709>
This commit is contained in:
Eric Engestrom
2024-10-18 16:48:48 +02:00
committed by Marge Bot
parent 18489da224
commit bb98949134
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
.ci-farms/freedreno → .ci-farms/google-freedreno
View File

18
.gitlab-ci/farm-rules.yml
View File

@@ -217,25 +217,25 @@
- !reference [.austriancoder-farm-rules, rules] - !reference [.austriancoder-farm-rules, rules]
.freedreno-farm-rules: .google-freedreno-farm-rules:
rules: rules:
- exists: [ .ci-farms-disabled/freedreno ] - exists: [ .ci-farms-disabled/google-freedreno ]
when: never when: never
- changes: [ .ci-farms-disabled/freedreno ] - changes: [ .ci-farms-disabled/google-freedreno ]
if: '$CI_PIPELINE_SOURCE != "schedule"' if: '$CI_PIPELINE_SOURCE != "schedule"'
when: on_success when: on_success
- changes: [ .ci-farms-disabled/* ] - changes: [ .ci-farms-disabled/* ]
if: '$CI_PIPELINE_SOURCE != "schedule"' if: '$CI_PIPELINE_SOURCE != "schedule"'
when: never when: never
.freedreno-farm-manual-rules: .google-freedreno-farm-manual-rules:
rules: rules:
- exists: [ .ci-farms-disabled/freedreno ] - exists: [ .ci-farms-disabled/google-freedreno ]
when: never when: never
- changes: [ .ci-farms-disabled/freedreno ] - changes: [ .ci-farms-disabled/google-freedreno ]
if: '$CI_PIPELINE_SOURCE != "schedule"' if: '$CI_PIPELINE_SOURCE != "schedule"'
when: never when: never
- !reference [.freedreno-farm-rules, rules] - !reference [.google-freedreno-farm-rules, rules]
.vmware-farm-rules: .vmware-farm-rules:
rules: rules:
@@ -323,8 +323,8 @@
exists: [ .ci-farms-disabled/austriancoder ] exists: [ .ci-farms-disabled/austriancoder ]
when: never when: never
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes: [ .ci-farms-disabled/freedreno ] changes: [ .ci-farms-disabled/google-freedreno ]
exists: [ .ci-farms-disabled/freedreno ] exists: [ .ci-farms-disabled/google-freedreno ]
when: never when: never
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes: [ .ci-farms-disabled/ondracka ] changes: [ .ci-farms-disabled/ondracka ]

9
src/freedreno/ci/gitlab-ci-inc.yml
View File

@@ -64,12 +64,11 @@
when: manual when: manual
# Two different farms (Google Freedreno and Collabora farm)
.google-freedreno-rules: .google-freedreno-rules:
stage: freedreno stage: freedreno
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
- !reference [.freedreno-farm-rules, rules] - !reference [.google-freedreno-farm-rules, rules]
- !reference [.freedreno-rules, rules] - !reference [.freedreno-rules, rules]
.collabora-freedreno-rules: .collabora-freedreno-rules:
@@ -84,7 +83,7 @@
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
- !reference [.freedreno-farm-manual-rules, rules] - !reference [.google-freedreno-farm-manual-rules, rules]
- !reference [.freedreno-manual-rules, rules] - !reference [.freedreno-manual-rules, rules]
.collabora-freedreno-manual-rules: .collabora-freedreno-manual-rules:
@@ -100,7 +99,7 @@
stage: freedreno stage: freedreno
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
- !reference [.freedreno-farm-rules, rules] - !reference [.google-freedreno-farm-rules, rules]
- !reference [.turnip-rules, rules] - !reference [.turnip-rules, rules]
.collabora-turnip-rules: .collabora-turnip-rules:
@@ -115,7 +114,7 @@
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
- !reference [.freedreno-farm-manual-rules, rules] - !reference [.google-freedreno-farm-manual-rules, rules]
- !reference [.turnip-manual-rules, rules] - !reference [.turnip-manual-rules, rules]
.collabora-turnip-manual-rules: .collabora-turnip-manual-rules: