ci/freedreno: fix the a530_piglit job and switch to Weston

If we count devices which running a530 with mainline kernel and Mesa,
it's probably mostly phones and tablets running on Wayland. Adapt to it.

Fixes: 83c2b26acf1e ("ci/freedreno: Switch the piglit job to using a deqp-runner suite.")

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22255>

diff --git a/src/freedreno/ci/deqp-freedreno-a530-piglit.toml b/src/freedreno/ci/deqp-freedreno-a530-piglit.toml
new file mode 100644 (file)
index 0000000..3a11d09
--- /dev/null
+++ b/src/freedreno/ci/deqp-freedreno-a530-piglit.toml
@@ -0,0 +1,6 @@
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "gpu"
+process_isolation = true
+  [piglit.env]
+  PIGLIT_NO_WINDOW = "1"

diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index f2d79cd..cc5a50a 100644 (file)
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -103,22 +103,25 @@ a530_gl:
     PIGLIT_PLATFORM: gbm
   parallel: 6
 
+# piglit and piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
+# leave it as manual.  The shader_tests are in the main a530_gl suite.
+#
+# Disabled for now because something reliably takes out the board 19-20 minutes in,
+# and then it reboots and tries again until the job timeout.
 .a530_piglit:
   extends:
-    - .piglit-test
+    - .baremetal-deqp-test
     - .a530-test
+  parallel: 2
   variables:
-    HWCI_START_XORG: 1
+    DEQP_SUITE: freedreno-a530-piglit
+    HWCI_START_WESTON: 1
 
-# piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
-# leave it as manual.  The shader_tests are in the main a530_gl suite.
-#
-# Disabled for now because something reliably takes out the board 19-20 minutes in,
-# and then it reboots and tries again until the job timeout.
 .a530_piglit_gl:
   extends:
     - .a530_piglit
     - .freedreno-manual-rules
+  parallel: null
   variables:
     PIGLIT_PROFILES: quick_gl