From bbdaebae12b008ed7f803d3fa8a52372fb4d9578 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Mon, 15 Sep 2025 13:47:48 +0200
Subject: [PATCH] freedreno/ci: Move a306 and a530 jobs to LAVA

The a306 and a530 devices were moved from the Google farm to the Collabora LAVA farm.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37478>
---
 src/freedreno/ci/gitlab-ci-inc.yml | 29 +++++++++++++
 src/freedreno/ci/gitlab-ci.yml     | 66 ++++++++++++++++++------------
 2 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml
index 967fb7f0747..dfa55e6c7a6 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -230,6 +230,35 @@
       artifacts: false # we pull the artifacts from S3
   dependencies: null
 
+# Status: https://lava.collabora.dev/scheduler/device_type/dragonboard-410c
+.lava-dragonboard-410c:arm64:
+  variables:
+    BOOT_METHOD: fastboot
+    DEVICE_TYPE: dragonboard-410c
+    DTB: apq8016-sbc-usb-host
+    FDO_CI_CONCURRENT: 8
+    FARM: collabora
+    GPU_VERSION: freedreno-a306
+    KERNEL_IMAGE_NAME: "Image.gz"
+    KERNEL_IMAGE_TYPE: ""
+    RUNNER_TAG: mesa-ci-x86-64-lava-dragonboard-410c
+    LAVA_FIRMWARE: qcom-lava
+    KERNEL_TAG: msm-fixes-for-mesa-ci-14102025
+
+# Status: https://lava.collabora.dev/scheduler/device_type/dragonboard-820c
+.lava-dragonboard-820c:arm64:
+  variables:
+    BOOT_METHOD: fastboot
+    DEVICE_TYPE: dragonboard-820c
+    DTB: apq8096-db820c
+    FDO_CI_CONCURRENT: 8
+    FARM: collabora
+    GPU_VERSION: freedreno-a530
+    KERNEL_IMAGE_NAME: "Image.gz"
+    KERNEL_IMAGE_TYPE: ""
+    RUNNER_TAG: mesa-ci-x86-64-lava-dragonboard-820c
+    LAVA_FIRMWARE: qcom-lava
+    KERNEL_TAG: msm-fixes-for-mesa-ci-14102025
 
 # Status: https://lava.collabora.dev/scheduler/device_type/sc7180-trogdor-kingoftown
 .lava-sc7180-trogdor-kingoftown:arm64:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 39cba36f28b..16f65811a4f 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -1,21 +1,22 @@
 include:
   - local: 'src/freedreno/ci/gitlab-ci-inc.yml'
 
-.a306-gl:
+a306-gl:
   extends:
-    - .baremetal-deqp-test
-    - .a306-test
+    - .lava-arm64-test-gl
+    - .lava-dragonboard-410c:arm64
+    - .collabora-freedreno-rules
   variables:
     DEQP_SUITE: freedreno-a306
     FDO_CI_CONCURRENT: 6
   parallel: 5
 
-.a306-piglit:
+a306-piglit:
   extends:
-    - .baremetal-deqp-test
-    - .a306-test
+    - .lava-arm64-test-gl
+    - .lava-dragonboard-410c:arm64
     - .test-piglit
-    - .google-freedreno-manual-rules
+    - .collabora-freedreno-manual-rules
   timeout: 40m
   variables:
     DEQP_SUITE: freedreno-a306-piglit
@@ -26,53 +27,64 @@ include:
 # it started.
 .a306-piglit-gl:
   extends:
-    - .baremetal-deqp-test
-    - .a306-test
+    - .lava-arm64-test-gl
+    - .lava-dragonboard-410c:arm64
     - .test-piglit
-    - .google-freedreno-manual-rules
+    - .collabora-freedreno-manual-rules
   variables:
     BM_KERNEL_EXTRA_ARGS: "msm.num_hw_submissions=1"
     DEQP_SUITE: freedreno-a306-piglit-quick-gl
     FDO_CI_CONCURRENT: 3
     HWCI_START_WESTON: 1
 
-.a306-piglit-shader:
+a306-piglit-shader:
   extends:
-    - .baremetal-deqp-test
-    - .a306-test
+    - .lava-arm64-test-gl
+    - .lava-dragonboard-410c:arm64
     - .test-piglit
-    - .google-freedreno-manual-rules
+    - .collabora-freedreno-manual-rules
   variables:
     DEQP_SUITE: freedreno-a306-piglit-quick-shader
     FDO_CI_CONCURRENT: 6
     HWCI_START_WESTON: 1
 
-.a306-traces:
+a306-traces:
   extends:
-    - .google-freedreno-test-traces
-    - .a306-test
+    - .lava-arm64-piglit-traces
+    - .lava-dragonboard-410c:arm64
+    - .collabora-freedreno-rules
+  variables:
+    HWCI_START_WESTON: 1
+    PIGLIT_REPLAY_DEVICE_NAME: "${GPU_VERSION}"
+    PIGLIT_TRACES_FILE: traces-freedreno.yml
 
-.a530-gl:
+a530-gl:
   extends:
-    - .baremetal-deqp-test
+    - .lava-arm64-test-gl
+    - .lava-dragonboard-820c:arm64
     - .test-piglit
-    - .a530-test
+    - .collabora-freedreno-rules
   variables:
     DEQP_SUITE: freedreno-a530
     FDO_CI_CONCURRENT: 3  # if 4, sometimes "deqp-gles31, not enough memory for the allocation" appears
   parallel: 6
 
-.a530-traces:
+a530-traces:
   extends:
-    - .google-freedreno-test-traces
-    - .a530-test
+    - .lava-arm64-piglit-traces
+    - .lava-dragonboard-820c:arm64
+    - .collabora-freedreno-rules
+  variables:
+    HWCI_START_WESTON: 1
+    PIGLIT_REPLAY_DEVICE_NAME: "${GPU_VERSION}"
+    PIGLIT_TRACES_FILE: traces-freedreno.yml
 
-.a530-piglit:
+a530-piglit:
   extends:
-    - .baremetal-deqp-test
-    - .a530-test
+    - .lava-arm64-test-gl
+    - .lava-dragonboard-820c:arm64
     - .test-piglit
-    - .google-freedreno-manual-rules
+    - .collabora-freedreno-manual-rules
   parallel: 2
   variables:
     DEQP_SUITE: freedreno-a530-piglit