From a8c7a2fb69920a3de49076cb6fb9f75107d79de5 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 1 Sep 2023 14:52:31 +0100
Subject: [PATCH] ci/amd: split the polaris10 rules into one for each farm

There is now one polaris10 in each farm, so we need two rules for which
one to use.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24996>
---
 src/amd/ci/gitlab-ci.yml                  | 15 ++++++++++++---
 src/gallium/drivers/zink/ci/gitlab-ci.yml |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 34a2f1ff680..bf4c27340ea 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -338,7 +338,6 @@ radeonsi-raven-va-full:x86_64:
 
 .polaris10-test-valve:
   variables:
-    RUNNER_FARM_LOCATION: keywords
     FDO_CI_CONCURRENT: 16
     B2C_TIMEOUT_BOOT_RETRIES: 4
     # (2022-01) tsc=unstable was added in response to this message in kmsg,
@@ -347,6 +346,16 @@ radeonsi-raven-va-full:x86_64:
   tags:
     - amdgpu:codename:POLARIS10
 
+.polaris10-test-valve-mupuf:
+  extends: .polaris10-test-valve
+  variables:
+    RUNNER_FARM_LOCATION: mupuf
+
+.polaris10-test-valve-kws:
+  extends: .polaris10-test-valve
+  variables:
+    RUNNER_FARM_LOCATION: keywords
+
 .vega10-test-valve:
   variables:
     RUNNER_FARM_LOCATION: keywords
@@ -446,7 +455,7 @@ radeonsi-raven-va-full:x86_64:
 vkcts-polaris10-valve:
   extends:
     - .vkcts-test-valve
-    - .polaris10-test-valve
+    - .polaris10-test-valve-mupuf
     - .radv-valve-manual-rules
   timeout: 1h 15m
   variables:
@@ -580,7 +589,7 @@ radv-fossils:
 .vkd3d-polaris10-valve:
   extends:
     - .vkd3d-test-valve
-    - .polaris10-test-valve
+    - .polaris10-test-valve-kws
     - .radv-valve-manual-rules
   variables:
     VKD3D_PROTON_RESULTS: radv-polaris10-vkd3d
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 4b5400f2936..307ca7a7465 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -233,7 +233,7 @@ zink-tu-a618-traces-performance:
 zink-radv-polaris10-valve:
   extends:
     - .radv-zink-test-valve
-    - .polaris10-test-valve
+    - .polaris10-test-valve-kws
     - .zink-radv-manual-rules
   variables:
     GPU_VERSION: zink-radv-polaris10