From fbc55afbdfc93a82c69f1cd6a1f4abbed96cfd19 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Tue, 4 Mar 2025 12:12:12 -0300 Subject: [PATCH] ci/lava: Properly detect VMWARE farm This will make the job definition default to the UART format for vmware jobs, as only Collabora's farm relies on the SSH job definition due to the unreliable Chromebook UART in LAVA. Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/lava/utils/lava_farm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/lava/utils/lava_farm.py b/.gitlab-ci/lava/utils/lava_farm.py index dfd51ab9b92..ccd60aa60bf 100644 --- a/.gitlab-ci/lava/utils/lava_farm.py +++ b/.gitlab-ci/lava/utils/lava_farm.py @@ -8,13 +8,13 @@ class LavaFarm(Enum): LIMA = 1 COLLABORA = 2 - UNKNOWN = 3 - + VMWARE = 3 + UNKNOWN = 4 LAVA_FARM_RUNNER_PATTERNS: dict[LavaFarm, str] = { - # Lima pattern comes first, since it has the same prefix as the - # Collabora pattern. + # Lima and VMware patterns come first, since they have the same prefix as the Collabora pattern. LavaFarm.LIMA: r"^mesa-ci-[\x01-\x7F]+-lava-lima$", + LavaFarm.VMWARE: r"^mesa-ci-[\x01-\x7F]+-lava-vmware$", LavaFarm.COLLABORA: r"^mesa-ci-[\x01-\x7F]+-lava-[\x01-\x7F]+$", LavaFarm.UNKNOWN: r"^[\x01-\x7F]+", }