From: Matus Fabian Date: Sun, 24 Aug 2025 14:36:15 +0000 (-0400) Subject: hs-test: limit wget retries in setup scripts X-Git-Tag: v26.02-rc0~75 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a73c5f01fbf4947eda7110fe6dd21e90d3ba6545;p=vpp.git hs-test: limit wget retries in setup scripts by default wget do 20 retries, we want ti fails fast if internet connectivity is broken Type: test Change-Id: Ia7222c8ac6f7b5571dc1c29949aa2b8de2786afe Signed-off-by: Matus Fabian --- diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile index 902f3d922f2..8788d823830 100644 --- a/extras/hs-test/Makefile +++ b/extras/hs-test/Makefile @@ -302,7 +302,7 @@ install-deps: go version; \ else \ echo "Installing Go 1.23"; \ - wget https://go.dev/dl/go1.23.10.linux-$(ARCH).tar.gz -O /tmp/go1.23.10.linux-$(ARCH).tar.gz && sudo tar -C /usr/local -xzf /tmp/go1.23.10.linux-$(ARCH).tar.gz; \ + wget -t 2 https://go.dev/dl/go1.23.10.linux-$(ARCH).tar.gz -O /tmp/go1.23.10.linux-$(ARCH).tar.gz && sudo tar -C /usr/local -xzf /tmp/go1.23.10.linux-$(ARCH).tar.gz; \ sudo ln -s /usr/local/go/bin/go /usr/bin/go ; \ fi @sudo -E apt-get update diff --git a/extras/hs-test/docker/Dockerfile.ginkgo b/extras/hs-test/docker/Dockerfile.ginkgo index 2ec1e107ab9..4017b33c49e 100644 --- a/extras/hs-test/docker/Dockerfile.ginkgo +++ b/extras/hs-test/docker/Dockerfile.ginkgo @@ -8,11 +8,11 @@ ARG TARGETARCH ARG CODENAME ARG GO_VERSION=1.23.10 RUN echo "I'm building for ${TARGETARCH}" \ -&& wget "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" -O /tmp/go.tar.gz \ +&& wget -t 2 "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" -O /tmp/go.tar.gz \ && tar -xzf /tmp/go.tar.gz -C /usr/local \ && rm /tmp/go.tar.gz -RUN wget "https://download.docker.com/linux/ubuntu/dists/${CODENAME}/pool/stable/${TARGETARCH}/docker-ce-cli_28.3.2-1~ubuntu.${UBUNTU_VERSION}~${CODENAME}_${TARGETARCH}.deb" \ +RUN wget -t 2 "https://download.docker.com/linux/ubuntu/dists/${CODENAME}/pool/stable/${TARGETARCH}/docker-ce-cli_28.3.2-1~ubuntu.${UBUNTU_VERSION}~${CODENAME}_${TARGETARCH}.deb" \ -O /tmp/docker-ce-cli.deb RUN dpkg -i /tmp/docker-ce-cli.deb diff --git a/extras/hs-test/script/build_curl.sh b/extras/hs-test/script/build_curl.sh index d3fc84a357c..31ff030f244 100755 --- a/extras/hs-test/script/build_curl.sh +++ b/extras/hs-test/script/build_curl.sh @@ -1,6 +1,6 @@ #!/bin/bash set -x OS_ARCH="$(uname -m)" -wget https://github.com/stunnel/static-curl/releases/download/8.15.0/curl-linux-"${OS_ARCH}"-glibc-8.15.0.tar.xz +wget -t 2 https://github.com/stunnel/static-curl/releases/download/8.15.0/curl-linux-"${OS_ARCH}"-glibc-8.15.0.tar.xz tar -xvf ./curl-linux-"${OS_ARCH}"-glibc-8.15.0.tar.xz cp curl /usr/bin/curl \ No newline at end of file