From ea886f23d12938ccd38c92a825249b975c7935d0 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Tue, 28 Jun 2022 13:45:16 -0700
Subject: [PATCH] ci/zink: Simplify lavapipe rules setup, and clarify what the
 rules are for.

Reviewed-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Acked-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17287>
---
 .gitlab-ci/test-source-dep.yml            | 8 ++------
 src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 7497406b05e..ffeae7cf0b6 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -485,15 +485,11 @@
       - src/gallium/drivers/zink/**/*
       when: on_success
 
-.zink-rules:
+.zink-lvp-rules:
   stage: layered-backends
   rules:
-    - !reference [.no_scheduled_pipelines-rules, rules]
     - !reference [.zink-common-rules, rules]
-    - changes:
-        *lavapipe_file_list
-      when: on_success
-    - when: never
+    - !reference [.lavapipe-rules, rules]
 
 .zink-anv-rules:
   stage: layered-backends
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index ef649f9543e..36f73eb05d7 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -1,6 +1,6 @@
 .zink-lvp-test:
   extends:
-    - .zink-rules
+    - .zink-lvp-rules
   variables:
     MESA_LOADER_DRIVER_OVERRIDE: "zink"
     LIBGL_ALWAYS_SOFTWARE: "true"