From bb98949134a7ac96863b830c94c0bce6eed46fb9 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 18 Oct 2024 16:48:48 +0200
Subject: [PATCH] ci: rename "freedreno" farm to "google-freedreno"

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

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31709>
---
 .ci-farms/{freedreno => google-freedreno} |  0
 .gitlab-ci/farm-rules.yml                 | 18 +++++++++---------
 src/freedreno/ci/gitlab-ci-inc.yml        |  9 ++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)
 rename .ci-farms/{freedreno => google-freedreno} (100%)

diff --git a/.ci-farms/freedreno b/.ci-farms/google-freedreno
similarity index 100%
rename from .ci-farms/freedreno
rename to .ci-farms/google-freedreno
diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml
index eaddaa9fbd1..7b4d453ea83 100644
--- a/.gitlab-ci/farm-rules.yml
+++ b/.gitlab-ci/farm-rules.yml
@@ -217,25 +217,25 @@
     - !reference [.austriancoder-farm-rules, rules]
 
 
-.freedreno-farm-rules:
+.google-freedreno-farm-rules:
   rules:
-    - exists: [ .ci-farms-disabled/freedreno ]
+    - exists: [ .ci-farms-disabled/google-freedreno ]
       when: never
-    - changes: [ .ci-farms-disabled/freedreno ]
+    - changes: [ .ci-farms-disabled/google-freedreno ]
       if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: on_success
     - changes: [ .ci-farms-disabled/* ]
       if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
 
-.freedreno-farm-manual-rules:
+.google-freedreno-farm-manual-rules:
   rules:
-    - exists: [ .ci-farms-disabled/freedreno ]
+    - exists: [ .ci-farms-disabled/google-freedreno ]
       when: never
-    - changes: [ .ci-farms-disabled/freedreno ]
+    - changes: [ .ci-farms-disabled/google-freedreno ]
       if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - !reference [.freedreno-farm-rules, rules]
+    - !reference [.google-freedreno-farm-rules, rules]
 
 .vmware-farm-rules:
   rules:
@@ -323,8 +323,8 @@
       exists: [ .ci-farms-disabled/austriancoder ]
       when: never
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/freedreno ]
-      exists: [ .ci-farms-disabled/freedreno ]
+      changes: [ .ci-farms-disabled/google-freedreno ]
+      exists: [ .ci-farms-disabled/google-freedreno ]
       when: never
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes: [ .ci-farms-disabled/ondracka ]
diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml
index 6a1cafe25f3..b3d8cc29059 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -64,12 +64,11 @@
       when: manual
 
 
-# Two different farms (Google Freedreno and Collabora farm)
 .google-freedreno-rules:
   stage: freedreno
   rules:
     - !reference [.test, rules]
-    - !reference [.freedreno-farm-rules, rules]
+    - !reference [.google-freedreno-farm-rules, rules]
     - !reference [.freedreno-rules, rules]
 
 .collabora-freedreno-rules:
@@ -84,7 +83,7 @@
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
-    - !reference [.freedreno-farm-manual-rules, rules]
+    - !reference [.google-freedreno-farm-manual-rules, rules]
     - !reference [.freedreno-manual-rules, rules]
 
 .collabora-freedreno-manual-rules:
@@ -100,7 +99,7 @@
   stage: freedreno
   rules:
     - !reference [.test, rules]
-    - !reference [.freedreno-farm-rules, rules]
+    - !reference [.google-freedreno-farm-rules, rules]
     - !reference [.turnip-rules, rules]
 
 .collabora-turnip-rules:
@@ -115,7 +114,7 @@
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
-    - !reference [.freedreno-farm-manual-rules, rules]
+    - !reference [.google-freedreno-farm-manual-rules, rules]
     - !reference [.turnip-manual-rules, rules]
 
 .collabora-turnip-manual-rules: