From 9dc8bb4403796b7122cde6697fe2387b3f9c1238 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 7 May 2026 09:16:52 +0200 Subject: [PATCH] ci/lava: Reduce LAVA job timeout to 20 minutes for Marge GitLab jobs use a default 1-hour timeout, which can allow jobs to run longer than intended. We can override the LAVA timeout for Marge to have a still conservative, but safer timeout. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/lava/lava-submit.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index d638889a1a9..43cf198c9a5 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -41,6 +41,14 @@ fdo_log_section_end variables fdo_log_section_start_collapsed lava_submit "Submitting job for scheduling" +# GitLab jobs use a default 1-hour timeout, which can allow jobs to run longer than intended. +# CI_JOB_TIMEOUT (GitLab timeout in seconds) is used here to set the LAVA job timeout. +# For Marge, we override this to 25 minutes (with 5 minutes subtracted below for lava-job-submitter), +# giving a still conservative, but safer timeout to avoid jobs running for too long. +if [ $GITLAB_USER_LOGIN == "marge-bot" ]; then + export CI_JOB_TIMEOUT=1500 +fi + touch results/lava.log tail -f results/lava.log & # Ensure that we are printing the commands that are being executed,