ci/freedreno: Fix dependencies for trace jobs

The way we pull needs is overly baroque and relies on some jobs
overriding some other jobs to not be broken. This doesn't make it all
the way better, but does improve at least some parts.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35203>

.gitlab-ci/test-source-dep.yml

@@ -128,13 +128,6 @@
   # longer to finish, as they don't block marge from merging an MR.
   parallel: null
 
-.piglit-performance:arm64:
-  extends:
-    - .piglit-performance-base
-  needs:
-    - debian/baremetal_arm64_test-gl
-    - debian-arm64-release
-
 # Mesa source file dependencies that may impact any GL driver test job.
 .gallium-core-rules:
   rules:

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

@@ -216,8 +216,9 @@
     # Ensure that we are using the release build artifact
     S3_ARTIFACT_NAME: mesa-arm64-default-release
   needs:
-    - debian/x86_64_build
-    - debian-arm64-release
+    - alpine/x86_64_lava-trigger
+    - job: debian-arm64-release
+      artifacts: false # we pull the artifacts from S3
   dependencies: null
 
 

src/freedreno/ci/gitlab-ci.yml

@@ -227,15 +227,11 @@ a618-traces:
 a618-traces-performance:
   extends:
     - a618-traces
-    - .piglit-performance:arm64
     - .collabora-freedreno-rules-performance
   variables:
     # Always use the same device
     # a618 tag starts with cbg-1 (not cbg-0) for some reason
     LAVA_TAGS: "cbg-1"
-  needs:
-    - !reference [a618-traces, needs]
-    - !reference [.piglit-performance:arm64, needs]
 
 a660-angle:
   extends:

src/gallium/drivers/zink/ci/gitlab-ci.yml

@@ -172,9 +172,9 @@ zink-tu-a618-traces-performance:
   extends:
     - zink-tu-a618-traces
     - .zink-turnip-collabora-manual-rules
-    - .piglit-performance:arm64
+    - .piglit-performance-base
   rules:
-    - !reference [.piglit-performance:arm64, rules]
+    - !reference [.piglit-performance-base, rules]
     - !reference [.zink-turnip-collabora-manual-rules, rules]
   variables:
     # Always use the same device
@@ -182,7 +182,6 @@ zink-tu-a618-traces-performance:
     LAVA_TAGS: "cbg-1"
   needs:
     - !reference [zink-tu-a618-traces, needs]
-    - !reference [.piglit-performance:arm64, needs]
 
 zink-tu-a750:
   extends: