From 57541eaa9bacc2f149c9ec4f6457fe50aa83bdcd Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 15 Sep 2025 15:33:48 +0200 Subject: [PATCH] ci/lava: Make fastboot commands customizable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of hardcoding the A/B slot selection, allow an optional environment variable (LAVA_FASTBOOT_CMD) for devices that need it. This is used for sm8350-hdk to select slot A, but can be omitted for devices that don’t support A/B slots. Update the lava-trigger container to pull in https://gitlab.freedesktop.org/gfx-ci/lava-job-submitter/-/commit/1b521e7b38cb8c910230a27db144fd7544c1a925. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/lava/gitlab-ci.yml | 2 +- src/freedreno/ci/gitlab-ci-inc.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/lava/gitlab-ci.yml b/.gitlab-ci/lava/gitlab-ci.yml index c7c73d31395..e3522ede8ce 100644 --- a/.gitlab-ci/lava/gitlab-ci.yml +++ b/.gitlab-ci/lava/gitlab-ci.yml @@ -13,7 +13,7 @@ variables: # 4. lava/health-check-docker - the slim container used for fastboot # Set image: directly instead of extending .set-image to avoid conflicts # with MESA_IMAGE_PATH and FDO_DISTRIBUTION_TAG between the containers. - image: registry.freedesktop.org/gfx-ci/lava-job-submitter/alpine/x86_64_lava-trigger:20250929-lava-timeout + image: registry.freedesktop.org/gfx-ci/lava-job-submitter/alpine/x86_64_lava-trigger:20251009-fastboot # Cancel job if a newer commit is pushed to the same branch interruptible: true # The jobs themselves shouldn't actually run for an hour, of course. diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 6969ec9b023..66e2edf2796 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -284,6 +284,8 @@ KERNEL_IMAGE_NAME: "Image.gz" KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-sm8350-hdk + # The device has A/B boot slots - select slot A + LAVA_FASTBOOT_CMD: "set_active a" DRIVER_NAME: freedreno-a6xx VK_DRIVER: freedreno LAVA_FIRMWARE: qcom-lava