From a3d599e9324c8b210ab1b07a8285ea7adeb2ffed Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Mon, 2 Dec 2024 11:10:38 +0100
Subject: [PATCH] amd/ci: Convert LAVA RADV jobs to deqp-runner suites

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32455>
---
 src/amd/ci/deqp-radv-raven.toml  | 6 ++++++
 src/amd/ci/deqp-radv-stoney.toml | 6 ++++++
 src/amd/ci/gitlab-ci-inc.yml     | 2 --
 src/amd/ci/gitlab-ci.yml         | 3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 src/amd/ci/deqp-radv-raven.toml
 create mode 100644 src/amd/ci/deqp-radv-stoney.toml

diff --git a/src/amd/ci/deqp-radv-raven.toml b/src/amd/ci/deqp-radv-raven.toml
new file mode 100644
index 00000000000..d59f4e5c6d1
--- /dev/null
+++ b/src/amd/ci/deqp-radv-raven.toml
@@ -0,0 +1,6 @@
+# Basic test set
+[[deqp]]
+deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp-vk/mustpass/vk-main.txt"]
+tests_per_group = 5000
+renderer_check = "RADV RAVEN"
diff --git a/src/amd/ci/deqp-radv-stoney.toml b/src/amd/ci/deqp-radv-stoney.toml
new file mode 100644
index 00000000000..96c8888276e
--- /dev/null
+++ b/src/amd/ci/deqp-radv-stoney.toml
@@ -0,0 +1,6 @@
+# Basic test set
+[[deqp]]
+deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp-vk/mustpass/vk-main.txt"]
+tests_per_group = 5000
+renderer_check = "RADV STONEY"
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index a1272bfc0a7..0e6b2ae9a44 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -208,7 +208,6 @@
 # job prefixes: radeonsi (OpenGL), radv (Vulkan), amd (radeonsi+radv)
 .stoney-test:x86_64:
   variables:
-    DEQP_EXPECTED_RENDERER: STONEY
     FLAKES_CHANNEL: "#amd-ci"
 
 .radeonsi-stoney-test:x86_64:
@@ -227,7 +226,6 @@
     - .lava-hp-14-db0003na-grunt:x86_64
     - .radv-collabora-rules
   variables:
-    DEQP_VER: vk
     DRIVER_NAME: radv
     GPU_VERSION: radv-stoney-aco
 
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 1d2034667cf..8e1801df122 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -8,6 +8,7 @@ radv-stoney-vkcts:
     - .radv-stoney-test:x86_64
   parallel: 5
   variables:
+    DEQP_SUITE: radv-stoney
     DEQP_FRACTION: 18
 
 radv-stoney-angle:
@@ -63,7 +64,7 @@ radv-raven-vkcts:
     - .lava-asus-CM1400CXA-dalboz:x86_64
   parallel: 9
   variables:
-    DEQP_VER: vk
+    DEQP_SUITE: radv-raven
     DEQP_FRACTION: 6
 
 amd-raven-skqp: