turnip/ci: Ony increase hangcheck timer for spilling tests on a630

This also allows deleting the baremetal-deqp-test-freedreno-vk
definition.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32588>

src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml

@@ -20,6 +20,9 @@ include = ["dEQP-VK.graphicsfuzz.barrier-in-loop-with-break"]
 prefix = "spill-"
 tests_per_group = 1
 [deqp.env]
+# Increase the hangcheck timer for our spilling tests which bump up against
+# the .5s default.
+FREEDRENO_HANGCHECK_MS = "2000"
 IR3_SHADER_DEBUG = "spillall"
 # Disable leak checking as of CTS 1.3.3.0 because the CTS itself leaks memory
 ASAN_OPTIONS = "detect_leaks=0"

src/freedreno/ci/deqp-freedreno-a630-vk.toml

@@ -53,6 +53,9 @@ prefix = "spill-"
 fraction = 5
 tests_per_group = 1000
 [deqp.env]
+# Increase the hangcheck timer for our spilling tests which bump up against
+# the .5s default.
+FREEDRENO_HANGCHECK_MS = "2000"
 IR3_SHADER_DEBUG = "spillall"
 
 # dynamic rendering testing using emulated renderpass

src/freedreno/ci/gitlab-ci-inc.yml

@@ -291,14 +291,6 @@
   script:
     - ./install/bare-metal/fastboot.sh
 
-.baremetal-deqp-test-freedreno-vk:
-  extends:
-    - .baremetal-deqp-test
-  variables:
-    # Increase the hangcheck timer for our spilling tests which bump up against
-    # the .5s default.
-    FREEDRENO_HANGCHECK_MS: 2000
-
 .google-freedreno-test-traces:
   extends:
     - .piglit-traces-test

src/freedreno/ci/gitlab-ci.yml

@@ -299,7 +299,7 @@ a630-gles-asan-full:
 a630-vk:
   extends:
     - .a630-test
-    - .baremetal-deqp-test-freedreno-vk
+    - .baremetal-deqp-test
     - .google-turnip-rules
   variables:
     DEQP_SUITE: freedreno-a630-vk
@@ -322,7 +322,7 @@ a630-vk-full:
 a630-vk-asan:
   extends:
     - .a630-test
-    - .baremetal-deqp-test-freedreno-vk
+    - .baremetal-deqp-test
     - .baremetal-arm64-asan-test
     - .google-turnip-rules
   variables: