From 5828d86c26f87d73403e3eee7f277088e8246d6b Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 11 Jul 2023 18:55:01 +0100
Subject: [PATCH] ci: move zink files rules to
 src/gallium/drivers/zink/ci/gitlab-ci.yml

Signed-off-by: Eric Engestrom <eric@igalia.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24099>
---
 .gitlab-ci/test-source-dep.yml            | 70 ----------------------
 src/gallium/drivers/zink/ci/gitlab-ci.yml | 71 +++++++++++++++++++++++
 2 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 1f6bce2b1da..1d38d59ff69 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -461,76 +461,6 @@
     - kernel+rootfs_x86_64
     - debian-release
 
-.zink-common-rules:
-  rules:
-    - !reference [.gl-rules, rules]
-    - changes:
-      - src/gallium/drivers/zink/**/*
-      when: on_success
-
-.zink-common-manual-rules:
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.gl-manual-rules, rules]
-    - changes:
-      - src/gallium/drivers/zink/**/*
-      when: manual
-
-.zink-lvp-rules:
-  stage: layered-backends
-  rules:
-    - !reference [.lavapipe-rules, rules]
-    - !reference [.zink-common-rules, rules]
-
-.zink-anv-rules:
-  stage: layered-backends
-  rules:
-    - !reference [.anv-rules, rules]
-    - !reference [.zink-common-rules, rules]
-
-.zink-anv-manual-rules:
-  stage: layered-backends
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.anv-manual-rules, rules]
-    - !reference [.zink-common-manual-rules, rules]
-
-.zink-anv-rules-restricted:
-  stage: layered-backends
-  rules:
-    - !reference [.restricted-rules, rules]
-    - !reference [.anv-rules, rules]
-    - !reference [.zink-common-rules, rules]
-
-.zink-turnip-rules:
-  stage: layered-backends
-  rules:
-    - !reference [.turnip-rules, rules]
-    - !reference [.zink-common-rules, rules]
-
-.zink-turnip-manual-rules:
-  stage: layered-backends
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.turnip-manual-rules, rules]
-    - !reference [.zink-common-manual-rules, rules]
-
-.zink-radv-rules:
-  stage: layered-backends
-  rules:
-    - !reference [.radv-valve-rules, rules]
-    - !reference [.zink-common-rules, rules]
-
-.zink-radv-manual-rules:
-  stage: layered-backends
-  retry: !reference [.scheduled_pipeline-rules, retry]
-  rules:
-    - !reference [.radv-valve-manual-rules, rules]
-    - !reference [.zink-common-manual-rules, rules]
-    - changes:
-      - .gitlab-ci/container/build-piglit.sh
-      when: manual
-
 # Rules for unusual architectures that only build a subset of drivers
 .ppc64el-rules:
    rules:
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index afdb70deae7..bd29733162b 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -1,3 +1,74 @@
+.zink-common-rules:
+  rules:
+    - !reference [.gl-rules, rules]
+    - changes:
+      - src/gallium/drivers/zink/**/*
+      when: on_success
+
+.zink-common-manual-rules:
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+      - src/gallium/drivers/zink/**/*
+      when: manual
+
+.zink-lvp-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.lavapipe-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
+.zink-anv-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.anv-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
+.zink-anv-manual-rules:
+  stage: layered-backends
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.anv-manual-rules, rules]
+    - !reference [.zink-common-manual-rules, rules]
+
+.zink-anv-rules-restricted:
+  stage: layered-backends
+  rules:
+    - !reference [.restricted-rules, rules]
+    - !reference [.anv-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
+.zink-turnip-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.turnip-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
+.zink-turnip-manual-rules:
+  stage: layered-backends
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.turnip-manual-rules, rules]
+    - !reference [.zink-common-manual-rules, rules]
+
+.zink-radv-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.radv-valve-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
+.zink-radv-manual-rules:
+  stage: layered-backends
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.radv-valve-manual-rules, rules]
+    - !reference [.zink-common-manual-rules, rules]
+    - changes:
+      - .gitlab-ci/container/build-piglit.sh
+      when: manual
+
+
 .zink-test:
   variables:
     MESA_LOADER_DRIVER_OVERRIDE: "zink"