From d19d0fe2eb84d3a5139fe71c12e5eb6d037edda2 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Wed, 14 Dec 2022 12:12:40 -0800
Subject: [PATCH] ci/zink: Refactor a bit of test configuration yaml.

I'm adding more zink tests shortly.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20503>
---
 src/gallium/drivers/zink/ci/gitlab-ci.yml | 37 ++++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 55dd5b285a0..9eb70ed419a 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -1,12 +1,29 @@
+.zink-test:
+  variables:
+    MESA_LOADER_DRIVER_OVERRIDE: "zink"
+    FLAKES_CHANNEL: "#zink-ci"
+
+.zink-trace-test:
+  extends:
+    - .zink-test
+  variables:
+    # The libX11 in the debian we use doesn't XInitThreads() by default (need
+    # 1.8.1 for that), and eglretrace's waffle GLX path doesn't call it either,
+    # which ends up causing trouble with kopper's X usage.  Use gbm for our
+    # trace replay, instead.
+    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6753
+    HWCI_START_XORG: ""
+    WAFFLE_PLATFORM: gbm
+    PIGLIT_PLATFORM: gbm
+
 .zink-lvp-test:
   extends:
     - .zink-lvp-rules
+    - .zink-test
   variables:
-    MESA_LOADER_DRIVER_OVERRIDE: "zink"
     LIBGL_ALWAYS_SOFTWARE: "true"
     LVP_POISON_MEMORY: "1"
     GPU_VERSION: zink-lvp
-    FLAKES_CHANNEL: "#zink-ci"
     # Fix non-conformant llvmpipe filter defaults
     GALLIVM_PERF: "no_quad_lod"
 
@@ -27,9 +44,8 @@ zink-anv-tgl:
   extends:
     - .anv-tgl-test
     - .zink-anv-rules
+    - .zink-test
   variables:
-    FLAKES_CHANNEL: "#zink-ci"
-    MESA_LOADER_DRIVER_OVERRIDE: "zink"
     DEQP_SUITE: zink-anv-tgl
     PIGLIT_NO_WINDOW: 1
     VK_DRIVER: intel
@@ -40,10 +56,9 @@ zink-tu-a618:
   extends:
     - .a618-test
     - .zink-turnip-rules
+    - .zink-test
   parallel: 3
   variables:
-    FLAKES_CHANNEL: "#zink-ci"
-    MESA_LOADER_DRIVER_OVERRIDE: "zink"
     DEQP_SUITE: zink-freedreno-a618
     HWCI_START_XORG: 1
     GPU_VERSION: zink-freedreno-a618
@@ -57,15 +72,7 @@ zink-freedreno-a630-traces:
   extends:
     - a630-traces
     - .zink-turnip-rules
+    - .zink-trace-test
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "zink-a630"
-    MESA_LOADER_DRIVER_OVERRIDE: zink
-    # The libX11 in the debian we use doesn't XInitThreads() by default (need
-    # 1.8.1 for that), and eglretrace's waffle GLX path doesn't call it either,
-    # which ends up causing trouble with kopper's X usage.  Use gbm for our
-    # trace replay, instead.
-    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6753
-    HWCI_START_XORG: ""
-    WAFFLE_PLATFORM: gbm
-    PIGLIT_PLATFORM: gbm
     ZINK_DEBUG: rp