ci: migrate from wget to curl

Better error handling is more reliable.

Options:
 -L, follow location
 --retry, number of retries
 --retry-all-errors, does not fail on ALL errors, that's why there is -f
 -f, fail fast with no output at all on server errors
 --retry-delay, make curl sleep this amount of time before each retry

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20788>

.gitlab-ci/bare-metal/cros-servo.sh

@@ -80,8 +80,9 @@ mkdir -p /nfs/results
 
 rm -rf /tftp/*
 if echo "$BM_KERNEL" | grep -q http; then
-  apt install -y wget
+  apt-get install -y curl
-  wget $BM_KERNEL -O /tftp/vmlinuz
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+      $BM_KERNEL -o /tftp/vmlinuz
 else
   cp $BM_KERNEL /tftp/vmlinuz
 fi

.gitlab-ci/bare-metal/fastboot.sh

@@ -100,10 +100,12 @@ fi
 # moving that container to the runner.  So, if BM_KERNEL+BM_DTB are URLs,
 # fetch them instead of looking in the container.
 if echo "$BM_KERNEL $BM_DTB" | grep -q http; then
-  apt install -y wget
+  apt-get install -y curl
 
-  wget $BM_KERNEL -O kernel
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  wget $BM_DTB -O dtb
+      "$BM_KERNEL" -o kernel
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+      "$BM_DTB" -o dtb
 
   cat kernel dtb > Image.gz-dtb
   rm kernel

.gitlab-ci/bare-metal/poe-powered.sh

@@ -85,8 +85,9 @@ date +'%F %T'
 
 # If BM_BOOTFS is an URL, download it
 if echo $BM_BOOTFS | grep -q http; then
-  apt install -y wget
+  apt-get install -y curl
-  wget ${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS -O /tmp/bootfs.tar
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    "${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS" -o /tmp/bootfs.tar
   BM_BOOTFS=/tmp/bootfs.tar
 fi
 

.gitlab-ci/common/init-stage2.sh

@@ -73,7 +73,8 @@ if [ "$HWCI_KVM" = "true" ]; then
         modprobe ${KVM_KERNEL_MODULE}
 
     mkdir -p /lava-files
-    wget -S --progress=dot:giga -O /lava-files/${KERNEL_IMAGE_NAME} \
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+	-o "/lava-files/${KERNEL_IMAGE_NAME}" \
         "${KERNEL_IMAGE_BASE_URL}/${KERNEL_IMAGE_NAME}"
 fi
 

.gitlab-ci/container/alpine/x86_build.sh

@@ -10,6 +10,7 @@ EPHEMERAL="
         automake
         bzip2
         cmake
+	curl
         git
         libtool
         libepoxy-dev
@@ -17,7 +18,6 @@ EPHEMERAL="
         make
         openssl-dev
         unzip
-        wget
         xz
 	zstd-dev
         "

.gitlab-ci/container/baremetal_build.sh

@@ -7,13 +7,14 @@ set -o xtrace
 # network transfer, disk usage, and runtime on test jobs)
 
 # shellcheck disable=SC2154 # arch is assigned in previous scripts
-if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
+if curl -X HEAD -s "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
   ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}"
 else
   ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${ARTIFACTS_SUFFIX}/${arch}"
 fi
 
-wget "${ARTIFACTS_URL}"/lava-rootfs.tar.zst -O rootfs.tar.zst
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    "${ARTIFACTS_URL}"/lava-rootfs.tar.zst -o rootfs.tar.zst
 mkdir -p /rootfs-"$arch"
 tar -C /rootfs-"$arch" '--exclude=./dev/*' --zstd -xf rootfs.tar.zst
 rm rootfs.tar.zst
@@ -22,9 +23,12 @@ if [[ $arch == "arm64" ]]; then
     mkdir -p /baremetal-files
     pushd /baremetal-files
 
-    wget "${ARTIFACTS_URL}"/Image
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    wget "${ARTIFACTS_URL}"/Image.gz
+	-O "${ARTIFACTS_URL}"/Image
-    wget "${ARTIFACTS_URL}"/cheza-kernel
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+        -O "${ARTIFACTS_URL}"/Image.gz
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+        -O "${ARTIFACTS_URL}"/cheza-kernel
 
     DEVICE_TREES=""
     DEVICE_TREES="$DEVICE_TREES apq8016-sbc.dtb"
@@ -33,7 +37,8 @@ if [[ $arch == "arm64" ]]; then
     DEVICE_TREES="$DEVICE_TREES imx8mq-nitrogen.dtb"
 
     for DTB in $DEVICE_TREES; do
-        wget "${ARTIFACTS_URL}/$DTB"
+	curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+            -O "${ARTIFACTS_URL}/$DTB"
     done
 
     popd
@@ -41,14 +46,16 @@ elif [[ $arch == "armhf" ]]; then
     mkdir -p /baremetal-files
     pushd /baremetal-files
 
-    wget "${ARTIFACTS_URL}"/zImage
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+        -O "${ARTIFACTS_URL}"/zImage
 
     DEVICE_TREES=""
     DEVICE_TREES="$DEVICE_TREES imx6q-cubox-i.dtb"
     DEVICE_TREES="$DEVICE_TREES tegra124-jetson-tk1.dtb"
 
     for DTB in $DEVICE_TREES; do
-        wget "${ARTIFACTS_URL}/$DTB"
+	curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+            -O "${ARTIFACTS_URL}/$DTB"
     done
 
     popd

.gitlab-ci/container/build-deqp.sh

@@ -16,12 +16,12 @@ pushd /VK-GL-CTS
 # vulkan-cts-1.3.3.0 uses zlib 1.2.12 which was removed from zlib server due to
 # a CVE. See https://zlib.net/
 # FIXME: Remove this patch when uprev to 1.3.4.0+
-wget -O- https://github.com/KhronosGroup/VK-GL-CTS/commit/6bb2e7d64261bedb503947b1b251b1eeeb49be73.patch |
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    git am -
+    "https://github.com/KhronosGroup/VK-GL-CTS/commit/6bb2e7d64261bedb503947b1b251b1eeeb49be73.patch" | git am -
 
 # Apply a patch to fix a bug in 1.3.3.0 that affects some new formats
-wget -O- https://github.com/KhronosGroup/VK-GL-CTS/commit/4fa2b40411921b304f5dad8d106b212ad5b0f172.patch |
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    git am -
+    "https://github.com/KhronosGroup/VK-GL-CTS/commit/4fa2b40411921b304f5dad8d106b212ad5b0f172.patch" | git am -
 
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git

.gitlab-ci/container/build-kernel.sh

@@ -4,7 +4,8 @@
 set -ex
 
 mkdir -p kernel
-wget -qO- ${KERNEL_URL} | tar -xj --strip-components=1 -C kernel
+curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 ${KERNEL_URL} \
+    | tar -xj --strip-components=1 -C kernel
 pushd kernel
 
 # The kernel doesn't like the gold linker (or the old lld in our debians).

.gitlab-ci/container/build-libdrm.sh

@@ -5,7 +5,8 @@ set -ex
 
 export LIBDRM_VERSION=libdrm-2.4.110
 
-wget https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
+curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
+    https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
 tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
 cd "$LIBDRM_VERSION"
 meson build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS

.gitlab-ci/container/build-llvm-spirv.sh

@@ -2,11 +2,14 @@
 
 set -ex
 
-wget https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v13.0.0.tar.gz
+VER="13.0.0"
-tar -xvf v13.0.0.tar.gz && rm v13.0.0.tar.gz
 
-mkdir SPIRV-LLVM-Translator-13.0.0/build
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-pushd SPIRV-LLVM-Translator-13.0.0/build
+    -O "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${VER}.tar.gz"
+tar -xvf "v${VER}.tar.gz" && rm "v${VER}.tar.gz"
+
+mkdir "SPIRV-LLVM-Translator-${VER}/build"
+pushd "SPIRV-LLVM-Translator-${VER}/build"
 cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
 ninja
 ninja install
@@ -15,5 +18,5 @@ ninja llvm-spirv
 cp tools/llvm-spirv/llvm-spirv /usr/bin/
 popd
 
-du -sh SPIRV-LLVM-Translator-13.0.0
+du -sh "SPIRV-LLVM-Translator-${VER}"
-rm -rf SPIRV-LLVM-Translator-13.0.0
+rm -rf "SPIRV-LLVM-Translator-${VER}"

.gitlab-ci/container/build-rust.sh

@@ -20,7 +20,8 @@ RUST_VERSION=1.59.0-2022-02-24
 # For rust in Mesa, we use rustup to install.  This lets us pick an arbitrary
 # version of the compiler, rather than whatever the container's Debian comes
 # with.
-wget https://sh.rustup.rs -O - | sh -s -- \
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
       --default-toolchain $RUST_VERSION \
       --profile minimal \
       -y

.gitlab-ci/container/create-rootfs.sh

@@ -15,7 +15,7 @@ if [ $DEBIAN_ARCH = arm64 ]; then
     "
 elif [ $DEBIAN_ARCH = amd64 ]; then
     # Add llvm 13 to the build image
-    apt-get -y install --no-install-recommends wget gnupg2 software-properties-common
+    apt-get -y install --no-install-recommends curl gnupg2 software-properties-common
     apt-key add /llvm-snapshot.gpg.key
     add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main"
     # Debian bullseye has older wine 5.0, we want >= 7.0 for traces.
@@ -61,6 +61,7 @@ apt-get -y install --no-install-recommends \
     $EXTRA_LOCAL_PACKAGES \
     bash \
     ca-certificates \
+    curl \
     firmware-realtek \
     initramfs-tools \
     jq \
@@ -103,7 +104,6 @@ apt-get -y install --no-install-recommends \
     strace \
     waffle-utils \
     weston \
-    wget \
     xinit \
     xserver-xorg-core \
     xwayland \

.gitlab-ci/container/cross_build.sh

@@ -15,6 +15,7 @@ apt-get update
 
 apt-get install -y --no-remove \
         $STABLE_EPHEMERAL \
+	curl \
         crossbuild-essential-$arch \
         libelf-dev:$arch \
         libexpat1-dev:$arch \
@@ -36,8 +37,7 @@ apt-get install -y --no-remove \
         libxrandr-dev:$arch \
         libxshmfence-dev:$arch \
         libxxf86vm-dev:$arch \
-        libwayland-dev:$arch \
+        libwayland-dev:$arch
-        wget
 
 if [[ $arch != "armhf" ]]; then
     # See the list of available architectures in https://apt.llvm.org/bullseye/dists/llvm-toolchain-bullseye-13/main/

.gitlab-ci/container/debian/android_build.sh

@@ -13,7 +13,8 @@ apt-get install -y --no-remove $EPHEMERAL
 
 # Fetch the NDK and extract just the toolchain we want.
 ndk=android-ndk-r21d
-wget -O $ndk.zip https://dl.google.com/android/repository/$ndk-linux-x86_64.zip
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -o $ndk.zip https://dl.google.com/android/repository/$ndk-linux-x86_64.zip
 unzip -d / $ndk.zip "$ndk/toolchains/llvm/*"
 rm $ndk.zip
 # Since it was packed as a zip file, symlinks/hardlinks got turned into
@@ -32,7 +33,8 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi
 # Not using build-libdrm.sh because we don't want its cleanup after building
 # each arch.  Fetch and extract now.
 export LIBDRM_VERSION=libdrm-2.4.110
-wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
 tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
 
 for arch in \
@@ -61,7 +63,8 @@ done
 rm -rf $LIBDRM_VERSION
 
 export LIBELF_VERSION=libelf-0.8.13
-wget https://fossies.org/linux/misc/old/$LIBELF_VERSION.tar.gz
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O https://fossies.org/linux/misc/old/$LIBELF_VERSION.tar.gz
 
 # Not 100% sure who runs the mirror above so be extra careful
 if ! echo "4136d7b4c04df68b686570afa26988ac ${LIBELF_VERSION}.tar.gz" | md5sum -c -; then

.gitlab-ci/container/debian/arm_build.sh

@@ -24,6 +24,7 @@ apt-get -y install \
 	bison \
 	ccache \
 	cmake \
+	curl \
 	debootstrap \
 	fastboot \
 	flex \
@@ -60,7 +61,6 @@ apt-get -y install \
 	python3-requests \
 	python3-setuptools \
 	u-boot-tools \
-	wget \
 	xz-utils \
 	zlib1g-dev \
 	zstd

.gitlab-ci/container/debian/arm_test.sh

@@ -11,6 +11,7 @@ apt-get update
 
 apt-get install -y --no-remove \
         cpio \
+        curl \
         fastboot \
         netcat \
         procps \
@@ -19,19 +20,20 @@ apt-get install -y --no-remove \
         python3-serial \
         rsync \
         snmp \
-        wget \
         zstd
 
 # setup SNMPv2 SMI MIB
-wget https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI.txt \
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O /usr/share/snmp/mibs/SNMPv2-SMI.txt
+    https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI.txt \
+    -o /usr/share/snmp/mibs/SNMPv2-SMI.txt
 
 . .gitlab-ci/container/baremetal_build.sh
 
 if [[ "$arch" == "arm64" ]]; then
     # This firmware file from Debian bullseye causes hangs
-    wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5 \
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      -O /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw
+      "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5" \
+      -o /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw
 fi
 
 mkdir -p /baremetal-files/jetson-nano/boot/

.gitlab-ci/container/debian/x86_build-base.sh

@@ -27,6 +27,7 @@ apt-get install -y --no-remove \
         $STABLE_EPHEMERAL \
         bison \
         ccache \
+	curl \
         dpkg-cross \
         findutils \
         flex \
@@ -67,7 +68,6 @@ apt-get install -y --no-remove \
         python3-requests \
         qemu-user \
         valgrind \
-        wget \
         x11proto-dri2-dev \
         x11proto-gl-dev \
         x11proto-randr-dev \

.gitlab-ci/container/debian/x86_build-mingw-patch.sh

@@ -17,7 +17,8 @@ mingw-w64-x86_64-zstd-1.5.2-2-any.pkg.tar.zst
 
 for i in $MINGW_PACKET_LIST
 do
-  wget -q https://mirror.msys2.org/mingw/mingw64/$i
+  curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 \
+    -O "https://mirror.msys2.org/mingw/mingw64/$i"
   tar xf $i --strip-components=1 -C /usr/x86_64-w64-mingw32/
 done
 popd

.gitlab-ci/container/debian/x86_build.sh

@@ -63,7 +63,8 @@ export         XORGMACROS_VERSION=util-macros-1.19.0
 
 . .gitlab-ci/container/build-mold.sh
 
-wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -O \
+  $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION

.gitlab-ci/container/debian/x86_test-base.sh

@@ -63,6 +63,7 @@ apt-get install -y \
       sysvinit-core
 
 apt-get install -y --no-remove \
+      curl \
       git \
       git-lfs \
       inetutils-syslogd \
@@ -94,7 +95,6 @@ apt-get install -y --no-remove \
       socat \
       vulkan-tools \
       waffle-utils \
-      wget \
       xauth \
       xvfb \
       zlib1g \

.gitlab-ci/container/debian/x86_test-vk.sh

@@ -51,12 +51,12 @@ STABLE_EPHEMERAL=" \
 
 apt-get install -y --no-remove --no-install-recommends \
       $STABLE_EPHEMERAL \
+      curl \
       libepoxy0 \
       libxcb-shm0 \
       pciutils \
       python3-lxml \
       python3-simplejson \
-      wget \
       xinit \
       xserver-xorg-video-amdgpu \
       xserver-xorg-video-ati

.gitlab-ci/container/fedora/x86_build.sh

@@ -16,7 +16,6 @@ EPHEMERAL="
         pkgconfig(gbm)
         pkgconfig(openssl)
         unzip
-        wget
         xz
         "
 
@@ -79,7 +78,8 @@ export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individu
 
 export         XORGMACROS_VERSION=util-macros-1.19.0
 
-wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    -O $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
 tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION

.gitlab-ci/container/install-wine-apitrace.sh

@@ -3,7 +3,8 @@
 APITRACE_VERSION="11.1"
 APITRACE_VERSION_DATE=""
 
-wget "https://github.com/apitrace/apitrace/releases/download/${APITRACE_VERSION}/apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"
+curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
+  "https://github.com/apitrace/apitrace/releases/download/${APITRACE_VERSION}/apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"
 7zr x "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z" \
       "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/apitrace.exe" \
       "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/d3dretrace.exe"

.gitlab-ci/container/install-wine-dxvk.sh

@@ -5,7 +5,8 @@ set -e
 dxvk_install_release() {
     local DXVK_VERSION=${1:-"1.10.3"}
 
-    wget "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+	-O "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"
     tar xzpf dxvk-"${DXVK_VERSION}".tar.gz
     # https://github.com/doitsujin/dxvk/issues/2921
     sed -i 's/wine="wine"/wine="wine32"/' "dxvk-${DXVK_VERSION}"/setup_dxvk.sh

.gitlab-ci/container/lava_build.sh

@@ -11,7 +11,8 @@ export DEBIAN_FRONTEND=noninteractive
 check_minio()
 {
     MINIO_PATH="${MINIO_HOST}/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
-    if wget -q --method=HEAD "https://${MINIO_PATH}/done"; then
+    if curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s -X HEAD \
+      "https://${MINIO_PATH}/done"; then
         exit
     fi
 }
@@ -84,11 +85,13 @@ fi
 
 apt-get update
 apt-get install -y --no-remove \
+		   -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' \
                    ${ARCH_PACKAGES} \
                    automake \
                    bc \
                    clang \
                    cmake \
+		   curl \
                    debootstrap \
                    git \
                    glslang-tools \
@@ -120,7 +123,6 @@ apt-get install -y --no-remove \
                    python3-numpy \
                    python3-serial \
                    unzip \
-                   wget \
                    zstd
 
 

.gitlab-ci/download-git-cache.sh

@@ -16,10 +16,11 @@ fi
 TMP_DIR=$(mktemp -d)
 
 echo "Downloading archived master..."
-/usr/bin/wget -O $TMP_DIR/$CI_PROJECT_NAME.tar.gz \
+curl --retry 4 -f --retry-all-errors --retry-delay 60 \
-              https://${MINIO_HOST}/git-cache/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz
+	      -o "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \
+              "https://${MINIO_HOST}/git-cache/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz"
 
-# check wget error code
+# check curl error code
 if [[ $? -ne 0 ]]
 then
     echo "Repository cache not available"

.gitlab-ci/image-tags.yml

@@ -1,9 +1,9 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2023-01-10-robust-wget"
+   DEBIAN_BASE_TAG: "2023-01-20-all-in-1"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2023-01-09-lavacli"
+   DEBIAN_BUILD_TAG: "2023-01-20-all-in-1"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2023-01-03-ci-libva-2.17"
@@ -17,9 +17,9 @@ variables:
    DEBIAN_X86_TEST_GL_TAG: "2023-01-12-cts"
    DEBIAN_X86_TEST_VK_TAG: "2023-01-12-cts"
 
-   ALPINE_X86_BUILD_TAG: "2023-01-10-robust-wget"
+   ALPINE_X86_BUILD_TAG: "2023-01-20-all-in-1"
-   FEDORA_X86_BUILD_TAG: "2023-01-10-robust-wget"
+   FEDORA_X86_BUILD_TAG: "2023-01-20-all-in-1"
-   KERNEL_ROOTFS_TAG: "2023-01-12-cts"
+   KERNEL_ROOTFS_TAG: "2023-01-20-all-in-1"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"

.gitlab-ci/lava/lava-gitlab-ci.yml

@@ -32,7 +32,7 @@
   tags:
     - $RUNNER_TAG
   after_script:
-    - wget -q "https://${JOB_RESULTS_PATH}" -O- | tar --zstd -x
+    - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s "https://${JOB_RESULTS_PATH}" | tar --zstd -x
 
 .lava-test:armhf:
   variables:

.gitlab-ci/lava/lava-submit.sh

@@ -5,7 +5,8 @@ set -x
 
 # Try to use the kernel and rootfs built in mainline first, so we're more
 # likely to hit cache
-if wget -q --method=HEAD "https://${BASE_SYSTEM_MAINLINE_HOST_PATH}/done"; then
+if curl -s -X HEAD -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    "https://${BASE_SYSTEM_MAINLINE_HOST_PATH}/done"; then
 	BASE_SYSTEM_HOST_PATH="${BASE_SYSTEM_MAINLINE_HOST_PATH}"
 else
 	BASE_SYSTEM_HOST_PATH="${BASE_SYSTEM_FORK_HOST_PATH}"

.gitlab-ci/lava/lava_job_submitter.py

@@ -161,7 +161,7 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
             x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()
         ]
         run_steps.append(
-            f"wget -S --progress=dot:giga -O- {args.job_rootfs_overlay_url} | tar -xz -C /",
+            f"curl -L --retry 4 -f --retry-all-errors --retry-delay 60 {args.job_rootfs_overlay_url} | tar -xz -C /",
         )
 
     if args.jwt_file:
@@ -180,7 +180,7 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
 
     run_steps += [
       'mkdir -p {}'.format(args.ci_project_dir),
-      'wget -S --progress=dot:giga -O- {} | tar --zstd -x -C {}'.format(args.build_url, args.ci_project_dir),
+      'curl {} | tar --zstd -x -C {}'.format(args.build_url, args.ci_project_dir),
 
       # Sleep a bit to give time for bash to dump shell xtrace messages into
       # console which may cause interleaving with LAVA_SIGNAL_STARTTC in some

.gitlab-ci/piglit/piglit-traces.sh

@@ -129,7 +129,7 @@ replay_minio_upload_images() {
             fi
             __MINIO_PATH="$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE"
             __DESTINATION_FILE_PATH="${line##*-}"
-            if wget -q --method=HEAD "https://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" 2>/dev/null; then
+            if curl -L -s -X HEAD "https://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" 2>/dev/null; then
                 continue
             fi
         else

.gitlab-ci/test/gitlab-ci.yml

@@ -132,7 +132,7 @@ rustfmt:
     - echo -e "\e[0Ksection_start:$(date +%s):artifacts_download[collapsed=true]\r\e[0KDownloading artifacts from minio"
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
     - rm -rf install
-    - wget ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst -S --progress=dot:giga -O- | tar --zstd -x
+    - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst | tar --zstd -x
     - echo -e "\e[0Ksection_end:$(date +%s):artifacts_download\r\e[0K"
   artifacts:
     when: always