From 1dbebd2619a498b6e5ea726dae65c6621c8fe1c8 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Mon, 3 Mar 2025 17:14:48 -0300 Subject: [PATCH] ci/lava: Add U-Boot action timeout for rockchip DUTs Add a specific timeout for the U-Boot action in LAVA job definitions for rockchip devices. This ensures sufficient time for U-Boot to download the kernel and set up early network, preventing potential job failures due to timeout constraints. This behavior started to happen since LAVA 2025.02 version. Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/lava/utils/lava_job_definition.py | 10 ++++++++++ .../data/FASTBOOT_force_uart=False_job_definition.yaml | 2 ++ .../data/FASTBOOT_force_uart=True_job_definition.yaml | 2 ++ .../data/UBOOT_force_uart=False_job_definition.yaml | 2 ++ .../data/UBOOT_force_uart=True_job_definition.yaml | 2 ++ 5 files changed, 18 insertions(+) diff --git a/.gitlab-ci/lava/utils/lava_job_definition.py b/.gitlab-ci/lava/utils/lava_job_definition.py index 2bc4081b4d6..c43a077fb3c 100644 --- a/.gitlab-ci/lava/utils/lava_job_definition.py +++ b/.gitlab-ci/lava/utils/lava_job_definition.py @@ -167,6 +167,16 @@ class LAVAJobDefinition: "minutes": 5 * NUMBER_OF_ATTEMPTS_LAVA_BOOT, }, + "uboot-action": { + # For rockchip DUTs, U-Boot auto-login action downloads the kernel and + # setup early network. This takes 72 seconds on average. + # The LAVA action that wraps it is `uboot-commands`, but we can't set a + # timeout for it directly, it is overridden by one third of `uboot-action` + # timeout. + # So actually, this timeout is here to enforce that `uboot-commands` + # timeout to be 100 seconds (300 sec / 3), which is more than enough. + "minutes": 5 + }, }, }, } diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml index 9459d46a590..78042b575a6 100644 --- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml +++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml @@ -16,6 +16,8 @@ timeouts: minutes: 1 depthcharge-action: minutes: 15 + uboot-action: + minutes: 5 actions: - deploy: timeout: diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml index af439c6a909..e9a36be899c 100644 --- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml +++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml @@ -16,6 +16,8 @@ timeouts: minutes: 1 depthcharge-action: minutes: 15 + uboot-action: + minutes: 5 actions: - deploy: timeout: diff --git a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml index d9904be03be..e0246ea5586 100644 --- a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml +++ b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml @@ -16,6 +16,8 @@ timeouts: minutes: 1 depthcharge-action: minutes: 15 + uboot-action: + minutes: 5 actions: - deploy: timeout: diff --git a/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml b/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml index bd3455da8c1..ea52a6d3db9 100644 --- a/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml +++ b/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml @@ -16,6 +16,8 @@ timeouts: minutes: 1 depthcharge-action: minutes: 15 + uboot-action: + minutes: 5 actions: - deploy: timeout: