zink/ci: merge piglit testing with deqp-runner for RADV

This avoids using an extra script to run GLCTS+piglit.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25062>

.gitlab-ci/valve/gl_combined_testing.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-function execute_testsuite {
-    local RESULTS_FOLDER EXEC_DONE_FILE
-
-    RESULTS_FOLDER="results/$1"
-    EXEC_DONE_FILE="$RESULTS_FOLDER/.done"
-
-    if [ ! -f "$EXEC_DONE_FILE" ]; then
-        DEQP_RESULTS_DIR="$RESULTS_FOLDER" PIGLIT_RESULTS_DIR="$RESULTS_FOLDER" $2
-        touch "$EXEC_DONE_FILE"
-    else
-        echo "--> Skipped, as it already was executed"
-    fi
-}
-
-echo -e "\n# GLES/GL CTS testing"
-DEQP_SUITE=zink-radv execute_testsuite gles ./install/deqp-runner.sh
-
-echo -e "\n# Piglit testing"
-execute_testsuite piglit ./install/piglit/piglit-runner.sh

src/gallium/drivers/zink/ci/deqp-zink-radv.toml

@@ -47,3 +47,13 @@ deqp_args = [
     "--deqp-visibility=hidden"
 ]
 timeout = 180.0
+
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "gpu"
+process_isolation = true
+timeout = 180.0
+  [piglit.env]
+  PIGLIT_NO_WINDOW = "1"
+  PIGLIT_PLATFORM = "gbm"
+  WAFFLE_PLATFORM = "gbm"

src/gallium/drivers/zink/ci/gitlab-ci.yml

@@ -221,9 +221,8 @@ zink-tu-a618-traces-performance:
     - .test-radv
     - .b2c-test-gl
   variables:
-    PIGLIT_PROFILES: all
-    PIGLIT_PLATFORM: gbm
-    HWCI_TEST_SCRIPT: ./install/valve/gl_combined_testing.sh
+    DEQP_SUITE: zink-radv
+    HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
     B2C_JOB_SUCCESS_REGEX: 'Execution is over, pipeline status: 0'
     B2C_TIMEOUT_OVERALL_MINUTES: 20