From 4a2717c4bd923e40ee1c012562a386042d0e70be Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Tue, 4 Mar 2025 20:11:06 -0300 Subject: [PATCH] ci: Specify the FARM variable for DUT jobs There are some jobs that were missing the FARM variable, which is useful to lava_job_submitter.py to classify how it should interact with each LAVA server and how it should assemble the job definition. Right now, we use a set of regexex with the RUNNER_TAG variable, but that is error-prone. Signed-off-by: Guilherme Gallo Part-of: --- src/gallium/drivers/lima/ci/gitlab-ci.yml | 1 + src/gallium/drivers/svga/ci/gitlab-ci.yml | 2 ++ src/intel/ci/gitlab-ci-inc.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/src/gallium/drivers/lima/ci/gitlab-ci.yml b/src/gallium/drivers/lima/ci/gitlab-ci.yml index cebb49e06b0..2a6a5c28ba5 100644 --- a/src/gallium/drivers/lima/ci/gitlab-ci.yml +++ b/src/gallium/drivers/lima/ci/gitlab-ci.yml @@ -17,6 +17,7 @@ DTB: meson-gxl-s805x-libretech-ac FDO_CI_CONCURRENT: 4 GPU_VERSION: lima + FARM: lima RUNNER_TAG: mesa-ci-x86-64-lava-lima FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri=" diff --git a/src/gallium/drivers/svga/ci/gitlab-ci.yml b/src/gallium/drivers/svga/ci/gitlab-ci.yml index 13f9379378a..6b719b73ff1 100644 --- a/src/gallium/drivers/svga/ci/gitlab-ci.yml +++ b/src/gallium/drivers/svga/ci/gitlab-ci.yml @@ -14,6 +14,7 @@ include: PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=${FDO_HTTP_CACHE_URI}" PIGLIT_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe" PIGLIT_RESULTS: "llvmpipe-replay" + FARM: vmware RUNNER_TAG: mesa-ci-x86-64-lava-vmware DEVICE_TYPE: qemu BOOT_METHOD: qemu-nfs @@ -32,6 +33,7 @@ vmware-vmx-piglit:x86_64: GPU_VERSION: svga DEQP_SUITE: vmware-vmx-piglit HWCI_START_WESTON: 1 + FARM: vmware RUNNER_TAG: mesa-ci-x86-64-lava-vmware DEVICE_TYPE: x86 BOOT_METHOD: ipxe diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 87c7b8c1b54..7c20aec5ecb 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -329,6 +329,7 @@ .lava-acer-chromebox-cxi4-puff:x86_64: variables: DEVICE_TYPE: acer-chromebox-cxi4-puff + FARM: collabora FDO_CI_CONCURRENT: 9 GPU_VERSION: iris-cml HWCI_KERNEL_MODULES: i915