ci: Move PIGLIT_PLATFORM settings out of the .tomls.

I'm going to add some automatic platform-based skips lists shortly (like
all-skips but more targeted), and this avoids needing to add them to each
.toml.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Martin Roukala <martin.roukala@mupuf.org>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Erico Nunes <nunes.erico@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20798>

diff --git a/src/amd/ci/deqp-radeonsi-stoney.toml b/src/amd/ci/deqp-radeonsi-stoney.toml
index 609d89b..c3ee1a8 100644 (file)
--- a/src/amd/ci/deqp-radeonsi-stoney.toml
+++ b/src/amd/ci/deqp-radeonsi-stoney.toml
@@ -33,5 +33,4 @@ profile = "gpu"
 process_isolation = true
 timeout = 180.0
   [piglit.env]
-  PIGLIT_PLATFORM = "mixed_glx_egl"
   PIGLIT_NO_WINDOW = "1"

diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index f2ab2a1..ce6af29 100644 (file)
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -20,6 +20,7 @@
     # 12 devices (2023-01-10)
     RUNNER_TAG: mesa-ci-x86-64-lava-acer-R721T-grunt
     DEVICE_TYPE: acer-R721T-grunt
+    PIGLIT_PLATFORM: mixed_glx_egl
 
 .radv-stoney-test:amd64:
   extends:

diff --git a/src/broadcom/ci/deqp-broadcom-rpi3.toml b/src/broadcom/ci/deqp-broadcom-rpi3.toml
index 152cf2b..fc9364b 100644 (file)
--- a/src/broadcom/ci/deqp-broadcom-rpi3.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi3.toml
@@ -29,5 +29,3 @@ deqp_args = [
 piglit_folder = "/piglit"
 profile = "quick_shader"
 process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "gbm"

diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index e2eb58b..0fafe0f 100644 (file)
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -19,6 +19,7 @@ vc4-rpi3:armhf:
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     DEQP_SUITE: broadcom-rpi3
+    PIGLIT_PLATFORM: gbm
 
 vc4-rpi3-egl:armhf:
   extends:

diff --git a/src/freedreno/ci/deqp-freedreno-a530.toml b/src/freedreno/ci/deqp-freedreno-a530.toml
index 34ed369..edbbeda 100644 (file)
--- a/src/freedreno/ci/deqp-freedreno-a530.toml
+++ b/src/freedreno/ci/deqp-freedreno-a530.toml
@@ -49,5 +49,3 @@ piglit_folder = "/piglit"
 # they're covered by the llvmpipe run.
 profile = "quick_shader"
 process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "gbm"

diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 5f8cce3..13e3fb1 100644 (file)
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -99,6 +99,7 @@ a530_gl:
     - .test-manual-mr # Unstable as of kernel 5.19
   variables:
     DEQP_SUITE: freedreno-a530
+    PIGLIT_PLATFORM: gbm
   parallel: 6
 
 .a530_piglit:

diff --git a/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml b/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml
index 00ad082..c59f479 100644 (file)
--- a/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml
+++ b/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml
@@ -28,5 +28,3 @@ piglit_folder = "/piglit"
 # they're covered by the llvmpipe run.
 profile = "gpu"
 process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "gbm"

diff --git a/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
index 129c07a..968e114 100644 (file)
--- a/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
+++ b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
@@ -67,5 +67,3 @@ piglit_folder = "/piglit"
 # they're covered by the llvmpipe run.
 profile = "gpu"
 process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "gbm"

diff --git a/src/gallium/drivers/crocus/ci/gitlab-ci.yml b/src/gallium/drivers/crocus/ci/gitlab-ci.yml
index 552c33e..efa2f21 100644 (file)
--- a/src/gallium/drivers/crocus/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/crocus/ci/gitlab-ci.yml
@@ -28,6 +28,7 @@ crocus-g41:
     - .deqp-test
   variables:
     DEQP_SUITE: crocus-g41
+    PIGLIT_PLATFORM: gbm
 
 crocus-hsw:
   extends:
@@ -35,6 +36,7 @@ crocus-hsw:
     - .deqp-test
   variables:
     DEQP_SUITE: crocus-hsw
+    PIGLIT_PLATFORM: gbm
 
 crocus-g41-traces:
   extends:

diff --git a/src/gallium/drivers/i915/ci/deqp-i915g.toml b/src/gallium/drivers/i915/ci/deqp-i915g.toml
index 21d62f6..ef5d9c0 100644 (file)
--- a/src/gallium/drivers/i915/ci/deqp-i915g.toml
+++ b/src/gallium/drivers/i915/ci/deqp-i915g.toml
@@ -28,5 +28,3 @@ piglit_folder = "/piglit"
 # they're covered by the llvmpipe run.
 profile = "gpu"
 process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "gbm"

diff --git a/src/gallium/drivers/i915/ci/gitlab-ci.yml b/src/gallium/drivers/i915/ci/gitlab-ci.yml
index acfaa09..e8ff9a9 100644 (file)
--- a/src/gallium/drivers/i915/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/i915/ci/gitlab-ci.yml
@@ -16,6 +16,7 @@ i915-g33:
     - .deqp-test
   variables:
     DEQP_SUITE: i915g
+    PIGLIT_PLATFORM: gbm
 
 i915-g33-traces:
   extends:

diff --git a/src/gallium/drivers/lima/ci/deqp-lima-mali450-piglit.toml b/src/gallium/drivers/lima/ci/deqp-lima-mali450-piglit.toml
index 71041e6..1cc8789 100644 (file)
--- a/src/gallium/drivers/lima/ci/deqp-lima-mali450-piglit.toml
+++ b/src/gallium/drivers/lima/ci/deqp-lima-mali450-piglit.toml
@@ -2,5 +2,3 @@
 piglit_folder = "/piglit"
 profile = "gpu"
 process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "gbm"

diff --git a/src/gallium/drivers/lima/ci/gitlab-ci.yml b/src/gallium/drivers/lima/ci/gitlab-ci.yml
index b6ed6e1..2e18a3a 100644 (file)
--- a/src/gallium/drivers/lima/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/lima/ci/gitlab-ci.yml
@@ -23,4 +23,5 @@ lima-mali450-piglit:arm64:
     - .lava-meson-gxl-s805x-libretech-ac
   variables:
     DEQP_SUITE: lima-mali450-piglit
+    PIGLIT_PLATFORM: gbm
   parallel: 2

diff --git a/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml b/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml
index 7e0a24e..26dcc82 100644 (file)
--- a/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml
+++ b/src/gallium/drivers/virgl/ci/deqp-virpipe-gl.toml
@@ -57,5 +57,3 @@ tests_per_group = 1
 piglit_folder = "/piglit"
 profile = "quick"
 process_isolation = true
-  [piglit.env]
-  PIGLIT_PLATFORM = "x11_egl"

diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 40c2e12..772460a 100644 (file)
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -15,6 +15,7 @@ virpipe-on-gl:
   variables:
     DEQP_SUITE: virpipe-gl
     GPU_VERSION: virpipe-gl
+    PIGLIT_PLATFORM: x11_egl
   tags:
     - mesa-swrast
 

diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml
index 481cba9..8c8b683 100644 (file)
--- a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml
+++ b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml
@@ -120,8 +120,3 @@ piglit_folder = "/piglit"
 profile = "gpu"
 process_isolation = true
 timeout = 180.0
-# We use gbm because X can die:
-# MESA: error: ZINK: vkQueueSubmit failed (VK_ERROR_DEVICE_LOST)
-# Xorg: ../src/gallium/drivers/zink/zink_batch.c:599: zink_end_batch: Assertion `!ctx->batch_states' failed.
-  [piglit.env]
-  PIGLIT_PLATFORM = "gbm"

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index e6e4469..c480d78 100644 (file)
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -56,6 +56,10 @@ zink-anv-tgl:
     DEQP_SUITE: zink-anv-tgl
     PIGLIT_NO_WINDOW: 1
     HWCI_START_XORG: 1
+    # We use gbm because X can die:
+    # MESA: error: ZINK: vkQueueSubmit failed (VK_ERROR_DEVICE_LOST)
+    # Xorg: ../src/gallium/drivers/zink/zink_batch.c:599: zink_end_batch: Assertion `!ctx->batch_states' failed.
+    PIGLIT_PLATFORM: gbm
 
 # Manual full run when you want to double-check the full status.
 zink-anv-tgl-full: