From b11a042c359652fe7e29d0db850f5c0ca279e0cc Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 1 Sep 2025 08:39:51 +0200 Subject: [PATCH] ci/crosvm: Retry all curl errors when downloading kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `--retry-connrefused` didn’t catch cases where the download started but failed midway. `--retry-all-errors` will cover those too. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13800 Fixes: d527da301f6 ("ci: Don't include the kernel in test-base image") Signed-off-by: Valentine Burley Part-of: (cherry picked from commit 3fc973f6caa0eeaafe895b0f9d00f67e2b77dd3f) --- .gitlab-ci/crosvm-runner.sh | 2 +- .pick_status.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index 467bf0a9d2e..1b7b8b2bd0e 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -123,7 +123,7 @@ fi if [ ! -f "/kernel/${KERNEL_IMAGE_NAME:-bzImage}" ]; then mkdir -p /kernel # shellcheck disable=SC2153 - curl -L --retry 4 -f --retry-connrefused --retry-delay 30 \ + curl -L --retry 4 -f --retry-all-errors --retry-delay 30 \ -o "/kernel/${KERNEL_IMAGE_NAME:-bzImage}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH:-amd64}/${KERNEL_IMAGE_NAME:-bzImage}" fi diff --git a/.pick_status.json b/.pick_status.json index b15520245b3..6cca5874cc2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1174,7 +1174,7 @@ "description": "ci/crosvm: Retry all curl errors when downloading kernel", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d527da301f6c690f008c831ecd9759fb497b1d24", "notes": null