freedreno/ci: Merge a660-piglit-cl and a660-gl

The actual runtime of `a660-piglit-cl` is under 2 minutes, so it can be
merged into `a660-gl` to improve resource utilization by avoiding the
launch of the additional job.

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

src/freedreno/ci/deqp-freedreno-a660-piglit-cl.toml

@@ -1,8 +0,0 @@
-[[piglit]]
-piglit_folder = "/piglit"
-profile = "cl"
-process_isolation = true
-skips = ["install/freedreno-a6xx-skips.txt"]
-  [piglit.env]
-  RUSTICL_ENABLE = "msm"
-

src/freedreno/ci/deqp-freedreno-a660.toml

@@ -169,3 +169,11 @@ deqp_args = [
 prefix = "spill-"
 [deqp.env]
 IR3_SHADER_DEBUG = "spillall"
+
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "cl"
+process_isolation = true
+skips = ["install/freedreno-a6xx-skips.txt"]
+  [piglit.env]
+  RUSTICL_ENABLE = "msm"

src/freedreno/ci/gitlab-ci.yml

@@ -230,7 +230,7 @@ a660-angle:
   variables:
     DEQP_SUITE: tu-angle
 
-a660-piglit-cl:
+a660-gl-cl:
   extends:
     - .lava-arm64-test-gl
     - .lava-sm8350-hdk:arm64
@@ -239,19 +239,11 @@ a660-piglit-cl:
   rules:
     - !reference [.collabora-freedreno-rules, rules]
     - !reference [.rusticl-rules, rules]
-  variables:
-    DEQP_SUITE: freedreno-a660-piglit-cl
-    HWCI_START_WESTON: 1
-
-a660-gl:
-  extends:
-    - .lava-arm64-test-gl
-    - .collabora-freedreno-rules
-    - .lava-sm8350-hdk:arm64
   parallel: 2
   variables:
     DEQP_SUITE: freedreno-a660
     DEQP_FRACTION: 2
+    HWCI_START_WESTON: 1
 
 a660-gl-full:
   extends: