From 1d7cce270079c58f0ff8993a8781cd84cb955bfe Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 25 Apr 2025 13:04:42 +0200
Subject: [PATCH] ci/ci-tron: default HWCI_TEST_SCRIPT to deqp-runner, as it's
 almost always what's run

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34710>
---
 .gitlab-ci/test/gitlab-ci.yml             | 3 +++
 src/amd/ci/gitlab-ci-inc.yml              | 5 -----
 src/amd/ci/gitlab-ci.yml                  | 1 -
 src/gallium/drivers/i915/ci/gitlab-ci.yml | 1 -
 src/gallium/drivers/r300/ci/gitlab-ci.yml | 4 ----
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 83097586906..5d0a50db6e8 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -380,6 +380,9 @@ yaml-toml-shell-py-test:
     B2C_JOB_TEMPLATE: "${CI_B2C_ARTIFACTS}/b2c.yml.jinja2.jinja2"
     JOB_FOLDER: "job_folder"
 
+    # Assume by default this is running deqp, as that's almost always true
+    HWCI_TEST_SCRIPT: install/deqp-runner.sh
+
   needs:
     - job: python-artifacts
       artifacts: true
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 2df42dfa7ba..b3d1fb94b71 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -308,10 +308,6 @@
   variables:
     B2C_KERNEL_URL: https://fs.mupuf.org/linux-6.6-b2c-radv-ci # 6.6
 
-.b2c-deqp-test:
-  variables:
-    HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
-
 .tahiti-test-valve:
   variables:
     FDO_CI_CONCURRENT: 24
@@ -463,7 +459,6 @@
 .vkcts-test-valve:
   extends:
     - .b2c-test-radv-vk
-    - .b2c-deqp-test
   variables:
     DEQP_SUITE: radv-valve
 
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index c83b19b358a..b9f2c81b6b8 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -274,7 +274,6 @@ radv-vangogh-vkcts:
 .radeonsi-vangogh-glcts-common:
   extends:
     - .b2c-x86_64-test-gl
-    - .b2c-deqp-test
     - .test-piglit
     - .vangogh-test-valve
   variables:
diff --git a/src/gallium/drivers/i915/ci/gitlab-ci.yml b/src/gallium/drivers/i915/ci/gitlab-ci.yml
index 5ad09855773..8d10cbf86d9 100644
--- a/src/gallium/drivers/i915/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/i915/ci/gitlab-ci.yml
@@ -17,7 +17,6 @@ include:
 i915-g33:
   extends:
     - .ondracka-g33-test
-    - .b2c-deqp-test
     - .test-piglit
   variables:
     DEQP_SUITE: i915g
diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml
index 27cf8319243..225a9da5444 100644
--- a/src/gallium/drivers/r300/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml
@@ -29,7 +29,6 @@ include:
 r300-rv530-deqp-gles2:
   extends:
     - .ondracka-rv530
-    - .b2c-deqp-test
   variables:
     DEQP_SUITE: r300-rv530
     GPU_VERSION: r300-rv530-nohiz
@@ -52,7 +51,6 @@ r300-rv530-nine:
 r300-rv380-deqp-gles2:
   extends:
     - .ondracka-rv380
-    - .b2c-deqp-test
   variables:
     DEQP_SUITE: r300-rv380
     GPU_VERSION: r300-rv380
@@ -60,7 +58,6 @@ r300-rv380-deqp-gles2:
 r300-rv410-deqp-piglit:
   extends:
     - .ondracka-generic
-    - .b2c-deqp-test
     - .test-piglit
   variables:
     DEQP_SUITE: r300-rv410
@@ -73,7 +70,6 @@ r300-rv410-deqp-piglit:
 r300-rv530-piglit:
   extends:
     - .ondracka-rv530
-    - .b2c-deqp-test
     - .test-piglit
   variables:
     DEQP_SUITE: r300-piglit