ci/freedreno: re-enable Cheza (Adreno 630) runners

Problems we're resolved.

This reverts commit 1f3446499f2d3ffa056e3c5928ecbc8c4faac836.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25376>

diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index c55a9ab..30c5964 100644 (file)
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -174,7 +174,7 @@ a660_vk_full:
     DEQP_SUITE: freedreno-a660-vk-full
     JOB_TIMEOUT: 180
 
-.a630_gl:
+a630_gl:
   extends:
     - .baremetal-deqp-test
     - .a630-test
@@ -184,7 +184,7 @@ a660_vk_full:
 
 # Run dEQP EGL window system tests separately with the window systems available.
 # X11 takes over the screen, wayland is run headless.
-.a630_egl:
+a630_egl:
   extends:
     - .baremetal-deqp-test
     - .a630-test
@@ -194,7 +194,7 @@ a660_vk_full:
     HWCI_START_WESTON: 1
     DEQP_SUITE: freedreno-a630-egl
 
-.a630_gles_asan:
+a630_gles_asan:
   extends:
     - .baremetal-deqp-test
     - .a630-test
@@ -206,7 +206,7 @@ a660_vk_full:
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
     GPU_VERSION: freedreno-a630-asan
 
-.a630_skqp:
+a630_skqp:
   extends:
     - .baremetal-deqp-test
     - .a630-test
@@ -216,7 +216,7 @@ a660_vk_full:
     HWCI_START_WESTON: 1
     DEQP_SUITE: freedreno-a630-skqp
 
-.a630_vk:
+a630_vk:
   extends:
     - .a630-test
     - .baremetal-deqp-test-freedreno-vk
@@ -224,14 +224,14 @@ a660_vk_full:
   variables:
     DEQP_SUITE: freedreno-a630-vk
 
-.a630_vk_full:
+a630_vk_full:
   # We use a longer timeout (3 hour job) to keep the parallel down so that we
   # don't lock up too many runners for a long time when a dev is testing full VK
   # status.  The full runs are restricted to just 2 runners to keep from
   # blocking up normal merges, so going more parallel doesn't make any sense.
   timeout: 3h
   extends:
-    - .a630_vk
+    - a630_vk
     - .a630-full
     - .google-turnip-manual-rules
   parallel: 2
@@ -239,7 +239,7 @@ a660_vk_full:
     DEQP_SUITE: freedreno-a630-vk-full
     TEST_PHASE_TIMEOUT: 180
 
-.a630_vk_asan:
+a630_vk_asan:
   extends:
     - .a630-test
     - .baremetal-deqp-test-freedreno-vk
@@ -250,7 +250,7 @@ a660_vk_full:
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
     GPU_VERSION: freedreno-a630-asan
 
-.a630_piglit:
+a630_piglit:
   extends:
     - .baremetal-deqp-test
     - .a630-test
@@ -260,7 +260,7 @@ a660_vk_full:
     HWCI_START_WESTON: 1
     DEQP_SUITE: freedreno-a630-piglit
 
-.a630-traces:
+a630-traces:
   extends:
     - .google-freedreno-test-traces
     - .a630-test
@@ -273,18 +273,18 @@ a660_vk_full:
     MESA_GL_VERSION_OVERRIDE: "4.6"
     PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri="
 
-.a630-traces-restricted:
+a630-traces-restricted:
   extends:
-    - .a630-traces
+    - a630-traces
     - .google-freedreno-rules-restricted
   variables:
     PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml"
     PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}"
   allow_failure: true
 
-.a630-traces-performance:
+a630-traces-performance:
   extends:
-    - .a630-traces
+    - a630-traces
     - .google-freedreno-rules-performance
   variables:
     PIGLIT_REPLAY_SUBCOMMAND: "profile"