From 74809ce0e3f062a5f054a2938de7e37029239583 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 22 Apr 2025 16:49:51 +0200 Subject: [PATCH] ci: drop dead wgetrc as there are no uses of wget in our CI images Note that if you grep, you'll find two instances of `wget`, but those are not executed in our docker images, but on the generic FDo gitlab runners, so the /etc/wgetrc file in our docker images cannot affect them. Part-of: --- .gitlab-ci/container/container_pre_build.sh | 8 -------- .gitlab-ci/container/lava_build.sh | 1 - 2 files changed, 9 deletions(-) diff --git a/.gitlab-ci/container/container_pre_build.sh b/.gitlab-ci/container/container_pre_build.sh index b4b36a93acd..7c5ac6a36c7 100755 --- a/.gitlab-ci/container/container_pre_build.sh +++ b/.gitlab-ci/container/container_pre_build.sh @@ -38,14 +38,6 @@ chmod +x /usr/local/bin/ninja # flags (doesn't apply to non-container builds, but we don't run make there) export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}" -# make wget to try more than once, when download fails or timeout -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 - # Ensure that rust tools are in PATH if they exist CARGO_ENV_FILE="$HOME/.cargo/env" if [ -f "$CARGO_ENV_FILE" ]; then diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index bed763a3b08..bd054fb56ce 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -402,7 +402,6 @@ rm $ROOTFS/{llvm-snapshot,winehq}.gpg.key rm "$ROOTFS/setup-test-env.sh" rm "$ROOTFS/setup-rootfs.sh" rm "$ROOTFS/strip-rootfs.sh" -cp /etc/wgetrc $ROOTFS/etc/. # Copy all tags to the rootfs, so test jobs can check if they are using the intended version TAG_FILE_DIR="$(get_tag_file)"