From 993dd0832fb007e03bfd8bac2e90bb98b8792c0d Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 2 Feb 2024 17:45:55 +0000
Subject: [PATCH] rpi4/ci: use deqp-runner suite for vk job as well

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27449>
---
 src/broadcom/ci/deqp-broadcom-rpi4-vk.toml | 5 +++++
 src/broadcom/ci/gitlab-ci.yml              | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src/broadcom/ci/deqp-broadcom-rpi4-vk.toml

diff --git a/src/broadcom/ci/deqp-broadcom-rpi4-vk.toml b/src/broadcom/ci/deqp-broadcom-rpi4-vk.toml
new file mode 100644
index 00000000000..e3182feb107
--- /dev/null
+++ b/src/broadcom/ci/deqp-broadcom-rpi4-vk.toml
@@ -0,0 +1,5 @@
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-main.txt"]
+tests_per_group = 5000
+renderer = "V3D.4.2"
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 32ef88554fc..1be9d3ffe91 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -69,9 +69,8 @@ v3dv-rpi4-vk:arm64:
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     HWCI_START_WESTON: 1
-    DEQP_EXPECTED_RENDERER: "V3D.4.2"
+    DEQP_SUITE: broadcom-rpi4-vk
     DEQP_FRACTION: 3
-    DEQP_VER: vk
     FLAKES_CHANNEL: "#videocore-ci"
 
 v3dv-rpi4-vk-full:arm64: