From a3b0300ef104b11bd0432aac2ab377d319db6e61 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Tue, 10 Jan 2023 23:45:08 +0100 Subject: [PATCH] ci: make wget even more robust The future is the curl or wget2, but today we have some issues to kill. Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/container_pre_build.sh | 2 ++ .gitlab-ci/image-tags.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/container_pre_build.sh b/.gitlab-ci/container/container_pre_build.sh index df529c38f0a..5490e5f97b1 100755 --- a/.gitlab-ci/container/container_pre_build.sh +++ b/.gitlab-ci/container/container_pre_build.sh @@ -45,4 +45,6 @@ export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}" echo -e "retry_connrefused = on\n" \ "read_timeout = 300\n" \ "tries = 4\n" \ + "retry_on_host_error = on\n" \ + "retry_on_http_error = 429,500,502,503,504\n" \ "wait_retry = 32" >> /etc/wgetrc diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index f75ad4e600a..2cbf738a1c5 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2023-01-09-virglrenderer" + DEBIAN_BASE_TAG: "2023-01-10-robust-wget" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2023-01-09-lavacli" @@ -17,8 +17,8 @@ variables: DEBIAN_X86_TEST_GL_TAG: "2023-01-08-weston-xwayland" DEBIAN_X86_TEST_VK_TAG: "2022-12-12-vkd3d-proton-uprev" - ALPINE_X86_BUILD_TAG: "2022-11-15-alpine-bringup" - FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" + ALPINE_X86_BUILD_TAG: "2023-01-10-robust-wget" + FEDORA_X86_BUILD_TAG: "2023-01-10-robust-wget" KERNEL_ROOTFS_TAG: "2023-01-10-virglrenderer" WINDOWS_X64_VS_PATH: "windows/x64_vs"