Merge branch 'ci-lava-timeout' into 'main'

ci/lava: Reduce LAVA job timeout to 20 minutes for Marge

See merge request mesa/mesa!41414
This commit is contained in:
Valentine Burley 2026-05-08 00:07:54 +00:00
commit dce3679255

View file

@ -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,