virgl/ci: clean up manual rules for virgl

In f6c06ef2f66 ("ci: Add manual rules variations to disable irrelevant
driver jobs."), we fixed this for *most* driver. This fixes up the last
driver, hopefully removing an annoying needless button in the UI for
some MRs.

Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Acked-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22263>

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index d418eba..ace142d 100644 (file)
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -755,6 +755,18 @@
       - src/gallium/winsys/virgl/**/*
       when: on_success
 
+.virgl-iris-manual-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.collabora-farm-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *virgl_file_list
+      when: manual
+    - changes:
+        *iris_file_list
+      when: manual
+
 .virgl-iris-rules-performance:
   stage: layered-backends
   rules:

diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index ccbc19d..fb46d1e 100644 (file)
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -90,8 +90,7 @@ virgl-traces:
 virgl-iris-traces:
   extends:
     - .virgl-iris-test
-    - .virgl-rules
-    - .test-manual-mr
+    - .virgl-iris-manual-rules
   variables:
     PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image --download-caching-proxy-url=${FDO_HTTP_CACHE_URI}"