From 5b04a2138f88ff2b489066532bcec14eb2018db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?=
 <martin.roukala@mupuf.org>
Date: Fri, 25 Nov 2022 15:20:03 +0200
Subject: [PATCH] radv/ci: merge all the zink jobs into a single one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since GL CTS, GLES CTS, and Piglit executions are very fast compared
to the machine setup time, it makes sense to combine them into one
boot.

The execution will run until the first test suite fails, or we are
done with the execution.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20006>
---
 .gitlab-ci/test/gitlab-ci.yml           |  2 +-
 .gitlab-ci/valve/gl_combined_testing.sh | 26 +++++++++++++++
 src/amd/ci/gitlab-ci.yml                | 44 ++++---------------------
 3 files changed, 33 insertions(+), 39 deletions(-)
 create mode 100755 .gitlab-ci/valve/gl_combined_testing.sh

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index fa094aacf22..e90252cdf26 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -330,7 +330,7 @@ rustfmt:
     paths:
       - ${JOB_FOLDER}/results
     reports:
-      junit: ${JOB_FOLDER}/results/junit.xml
+      junit: ${JOB_FOLDER}/results/**/junit.xml
 
 .b2c-test-vk:
   extends:
diff --git a/.gitlab-ci/valve/gl_combined_testing.sh b/.gitlab-ci/valve/gl_combined_testing.sh
new file mode 100755
index 00000000000..1d622ca6749
--- /dev/null
+++ b/.gitlab-ci/valve/gl_combined_testing.sh
@@ -0,0 +1,26 @@
+#!/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# GL CTS testing"
+DEQP_VER=gl46 execute_testsuite gl ./install/deqp-runner.sh
+
+echo -e "\n# GLES 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
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 24251f2245c..a606b77439c 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -363,52 +363,20 @@ vkcts-vangogh-valve:
   variables:
     GPU_VERSION: radv-vangogh-aco
 
-############### gles/GLCTS
-.glcts-test-valve:
+############### Combined Zink testing (GL, GLES, Piglit)
+.radv-zink-test-valve:
   extends:
     - .b2c-test-radv-gl
-    - .deqp-test-valve
     - .test-manual-mr
   variables:
-    DEQP_VER: gl46
-
-glcts-navi10-valve:
-  extends:
-    - .glcts-test-valve
-    - .navi10-test-valve
-    - .test-manual-mr
-  variables:
-    GPU_VERSION: zink-radv
-
-.gles-test-valve:
-  extends:
-    - .b2c-test-radv-gl
-    - .deqp-test-valve
-    - .test-manual-mr
-  variables:
-    DEQP_SUITE: zink-radv
-
-gles-navi10-valve:
-  extends:
-    - .gles-test-valve
-    - .navi10-test-valve
-    - .test-manual-mr
-  variables:
-    GPU_VERSION: zink-radv
-
-############### piglit
-.piglit-test-valve:
-  extends:
-    - .b2c-test-radv-gl
-  variables:
-    B2C_JOB_SUCCESS_REGEX: '^\+ PIGLIT_EXITCODE=0\r$'
-    B2C_TEST_SCRIPT: ./install/piglit/piglit-runner.sh
     PIGLIT_PROFILES: all
     PIGLIT_PLATFORM: gbm
+    B2C_TEST_SCRIPT: ./install/valve/gl_combined_testing.sh
+    B2C_JOB_SUCCESS_REGEX: 'Execution is over, pipeline status: 0'
 
-piglit-navi10-valve:
+radv-zink-navi10-valve:
   extends:
-    - .piglit-test-valve
+    - .radv-zink-test-valve
     - .navi10-test-valve
     - .test-manual-mr
   variables: