Module: Mesa
Branch: main
Commit: 2763655571acfc0020a1d3f4e41b599003a33474
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2763655571acfc0020a1d3f4e41b599003a33474

Author: Vignesh Raman <[email protected]>
Date:   Thu Dec 21 13:05:39 2023 +0530

ci/freedreno: add FARM variable

Add the `FARM: google` variable to the .google-freedreno-test job,
which is extended by devices managed by the Google farm. Add the
`FARM: collabora` variable to sc7180-trogdor-kingoftown,
sc7180-trogdor-lazor-limozeen and sm8350-hdk device types which
are available in Collabora farm.

This commit also adds DEVICE_TYPE variable for the .a306-test,
.a530-test and .a630-test jobs.

Signed-off-by: Vignesh Raman <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25807>

---

 src/freedreno/ci/gitlab-ci-inc.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/freedreno/ci/gitlab-ci-inc.yml 
b/src/freedreno/ci/gitlab-ci-inc.yml
index 285ebe7d20a..5367b48c8cf 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -201,6 +201,7 @@
     # Increase the hangcheck timer for our spilling tests which bump up against
     # the .5s default.
     FREEDRENO_HANGCHECK_MS: 2000
+    FARM: collabora
     GPU_VERSION: freedreno-a618
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown
@@ -218,6 +219,7 @@
     # Increase the hangcheck timer for our spilling tests which bump up against
     # the .5s default.
     FREEDRENO_HANGCHECK_MS: 2000
+    FARM: collabora
     GPU_VERSION: freedreno-a618
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
@@ -235,6 +237,7 @@
     # Increase the hangcheck timer for our spilling tests which bump up against
     # the .5s default.
     FREEDRENO_HANGCHECK_MS: 2000
+    FARM: collabora
     GPU_VERSION: freedreno-a660
     KERNEL_IMAGE_NAME: "Image.gz"
     KERNEL_IMAGE_TYPE: ""
@@ -253,6 +256,7 @@
     FLAKES_CHANNEL: "#freedreno-ci"
     PIGLIT_PLATFORM: mixed_glx_egl
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS 
root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init 
$BM_KERNELARGS"
+    FARM: google
   script:
     - ./install/bare-metal/fastboot.sh
 
@@ -282,6 +286,7 @@
   variables:
     BM_KERNEL: Image.gz
     BM_DTB: apq8016-sbc
+    DEVICE_TYPE: apq8016-sbc
     GPU_VERSION: freedreno-a307
   timeout: 20m
   tags:
@@ -313,6 +318,7 @@
   variables:
     BM_KERNEL: Image.gz
     BM_DTB: apq8096-db820c
+    DEVICE_TYPE: apq8096-db820c
     GPU_VERSION: freedreno-a530
   timeout: 20m
   tags:
@@ -348,6 +354,7 @@
     FDO_CI_CONCURRENT: 10
     BM_KERNEL: cheza-kernel
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw 
nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init"
+    DEVICE_TYPE: sdm845-cheza-r3
     GPU_VERSION: freedreno-a630
     FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d"  # 6.6 is slow and 
unstable
     KERNEL_IMAGE_BASE: 
https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG}

Reply via email to