Commit 9c521934 authored by Vignesh Raman's avatar Vignesh Raman Committed by Helen Koike

drm/ci: add farm variable

Mesa uses structured logs for logging and debug purpose,
https://mesa.pages.freedesktop.org/-/mesa/-/jobs/59165650/artifacts/results/job_detail.json

Since drm-ci uses the mesa scripts, add the farm variable
and update the device type for missing jobs.
Signed-off-by: default avatarVignesh Raman <vignesh.raman@collabora.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Acked-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHelen Koike <helen.koike@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240529024049.356327-3-vignesh.raman@collabora.com
parent cc806b74
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
variables: variables:
HWCI_TEST_SCRIPT: "/install/igt_runner.sh" HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
DEBIAN_ARCH: "armhf" DEBIAN_ARCH: "armhf"
FARM: collabora
dependencies: dependencies:
- testing:arm32 - testing:arm32
needs: needs:
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
variables: variables:
HWCI_TEST_SCRIPT: "/install/igt_runner.sh" HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
DEBIAN_ARCH: "arm64" DEBIAN_ARCH: "arm64"
FARM: collabora
dependencies: dependencies:
- testing:arm64 - testing:arm64
needs: needs:
...@@ -54,6 +56,7 @@ ...@@ -54,6 +56,7 @@
variables: variables:
HWCI_TEST_SCRIPT: "/install/igt_runner.sh" HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
DEBIAN_ARCH: "amd64" DEBIAN_ARCH: "amd64"
FARM: collabora
dependencies: dependencies:
- testing:x86_64 - testing:x86_64
needs: needs:
...@@ -74,6 +77,7 @@ ...@@ -74,6 +77,7 @@
S3_ARTIFACT_NAME: "arm64/kernel-files" S3_ARTIFACT_NAME: "arm64/kernel-files"
BM_KERNEL: https://${PIPELINE_ARTIFACTS_BASE}/arm64/Image.gz BM_KERNEL: https://${PIPELINE_ARTIFACTS_BASE}/arm64/Image.gz
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" 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
needs: needs:
- debian/arm64_test - debian/arm64_test
- job: testing:arm64 - job: testing:arm64
...@@ -116,8 +120,9 @@ msm:apq8016: ...@@ -116,8 +120,9 @@ msm:apq8016:
- .baremetal-igt-arm64 - .baremetal-igt-arm64
stage: msm stage: msm
variables: variables:
DEVICE_TYPE: apq8016-sbc-usb-host
DRIVER_NAME: msm DRIVER_NAME: msm
BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/apq8016-sbc-usb-host.dtb BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/${DEVICE_TYPE}.dtb
GPU_VERSION: apq8016 GPU_VERSION: apq8016
# disabling unused clocks congests with the MDSS runtime PM trying to # disabling unused clocks congests with the MDSS runtime PM trying to
# disable those clocks and causes boot to fail. # disable those clocks and causes boot to fail.
...@@ -132,9 +137,10 @@ msm:apq8096: ...@@ -132,9 +137,10 @@ msm:apq8096:
- .baremetal-igt-arm64 - .baremetal-igt-arm64
stage: msm stage: msm
variables: variables:
DEVICE_TYPE: apq8096-db820c
DRIVER_NAME: msm DRIVER_NAME: msm
BM_KERNEL_EXTRA_ARGS: maxcpus=2 BM_KERNEL_EXTRA_ARGS: maxcpus=2
BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/apq8096-db820c.dtb BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/${DEVICE_TYPE}.dtb
GPU_VERSION: apq8096 GPU_VERSION: apq8096
RUNNER_TAG: google-freedreno-db820c RUNNER_TAG: google-freedreno-db820c
script: script:
...@@ -146,6 +152,7 @@ msm:sdm845: ...@@ -146,6 +152,7 @@ msm:sdm845:
stage: msm stage: msm
parallel: 6 parallel: 6
variables: variables:
DEVICE_TYPE: sdm845-cheza-r3
DRIVER_NAME: msm DRIVER_NAME: msm
BM_KERNEL: https://${PIPELINE_ARTIFACTS_BASE}/arm64/cheza-kernel BM_KERNEL: https://${PIPELINE_ARTIFACTS_BASE}/arm64/cheza-kernel
GPU_VERSION: sdm845 GPU_VERSION: sdm845
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment