Re: [PATCH v3 2/6] drm/ci: add farm variable

Helen Koike
2024-06-06T14:19:16Z

On 28/05/2024 23:40, Vignesh Raman wrote:
> 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: Vignesh Raman <vignesh.raman@collabora.com>

Acked-by: Helen Koike <helen.koike@collabora.com>

> ---
>
> v3:
> - New commit to add farm variable and update device type variable.
>
> ---
> drivers/gpu/drm/ci/test.yml | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
> index 8bc63912fddb..2615f67f6aa3 100644
> --- a/drivers/gpu/drm/ci/test.yml
> +++ b/drivers/gpu/drm/ci/test.yml
> @@ -24,6 +24,7 @@
> variables:
> HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
> DEBIAN_ARCH: "armhf"
> + FARM: collabora
> dependencies:
> - testing:arm32
> needs:
> @@ -39,6 +40,7 @@
> variables:
> HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
> DEBIAN_ARCH: "arm64"
> + FARM: collabora
> dependencies:
> - testing:arm64
> needs:
> @@ -54,6 +56,7 @@
> variables:
> HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
> DEBIAN_ARCH: "amd64"
> + FARM: collabora
> dependencies:
> - testing:x86_64
> needs:
> @@ -74,6 +77,7 @@
> S3_ARTIFACT_NAME: "arm64/kernel-files"
> 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"
> + FARM: google
> needs:
> - debian/arm64_test
> - job: testing:arm64
> @@ -116,8 +120,9 @@ msm:apq8016:
> - .baremetal-igt-arm64
> stage: msm
> variables:
> + DEVICE_TYPE: apq8016-sbc-usb-host
> 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
> # disabling unused clocks congests with the MDSS runtime PM trying to
> # disable those clocks and causes boot to fail.
> @@ -132,9 +137,10 @@ msm:apq8096:
> - .baremetal-igt-arm64
> stage: msm
> variables:
> + DEVICE_TYPE: apq8096-db820c
> DRIVER_NAME: msm
> 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
> RUNNER_TAG: google-freedreno-db820c
> script:
> @@ -146,6 +152,7 @@ msm:sdm845:
> stage: msm
> parallel: 6
> variables:
> + DEVICE_TYPE: sdm845-cheza-r3
> DRIVER_NAME: msm
> BM_KERNEL: https://${PIPELINE_ARTIFACTS_BASE}/arm64/cheza-kernel
> GPU_VERSION: sdm845