From 03c30f4332620d30642a78bf52dfd7e54d5ac378 Mon Sep 17 00:00:00 2001
From: Julien Benhaim <julien.benhaim@mongodb.com>
Date: Tue, 21 Oct 2025 14:53:28 +0200
Subject: [PATCH 1/5] Add retries to tool install

---
 scripts/evergreen/lint_code.sh                       |  2 +-
 scripts/evergreen/setup_aws.sh                       |  2 +-
 scripts/evergreen/setup_gcloud_cli.sh                |  2 +-
 scripts/evergreen/setup_kubectl.sh                   |  2 +-
 scripts/evergreen/setup_mongosh.sh                   | 10 ++++++----
 scripts/evergreen/setup_prepare_openshift_bundles.sh |  2 +-
 scripts/evergreen/setup_shellcheck.sh                |  2 +-
 scripts/funcs/install                                |  2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/scripts/evergreen/lint_code.sh b/scripts/evergreen/lint_code.sh
index d0a070166..c554f9fd3 100755
--- a/scripts/evergreen/lint_code.sh
+++ b/scripts/evergreen/lint_code.sh
@@ -7,7 +7,7 @@ required_version="v2.0.2"
 # Install or update golangci-lint if not installed or version is incorrect
 if ! [[ -x "$(command -v golangci-lint)" ]]; then
     echo "Installing/updating golangci-lint to version ${required_version}..."
-    curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin "${required_version}"
+    curl --retry 5 --fail --show-error --max-time 180 -sSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin "${required_version}"
 else
     echo "golangci-lint is already installed"
 fi
diff --git a/scripts/evergreen/setup_aws.sh b/scripts/evergreen/setup_aws.sh
index 5f947fcb5..8a88c1bf3 100755
--- a/scripts/evergreen/setup_aws.sh
+++ b/scripts/evergreen/setup_aws.sh
@@ -19,7 +19,7 @@ install_aws_cli_binary() {
     cd "${temp_dir}"
 
     echo "Downloading AWS CLI v2 for ${aws_arch}..."
-    curl -s "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o "awscliv2.zip"
+    curl --retry 5 --fail --show-error --max-time 180 -s "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o "awscliv2.zip"
 
     unzip -q awscliv2.zip
     sudo ./aws/install --update
diff --git a/scripts/evergreen/setup_gcloud_cli.sh b/scripts/evergreen/setup_gcloud_cli.sh
index 1f51505cb..273759654 100755
--- a/scripts/evergreen/setup_gcloud_cli.sh
+++ b/scripts/evergreen/setup_gcloud_cli.sh
@@ -3,7 +3,7 @@ set -Eeou pipefail
 
 source scripts/dev/set_env_context.sh
 
-curl -s --retry 3 -LO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz"
+curl --retry 5 --fail --show-error --max-time 180 --silent -LO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz"
 tar xf google-cloud-cli-linux-x86_64.tar.gz -C "${workdir}"
 "${workdir}"/google-cloud-sdk/install.sh --quiet
 source "${workdir}/google-cloud-sdk/path.bash.inc"
diff --git a/scripts/evergreen/setup_kubectl.sh b/scripts/evergreen/setup_kubectl.sh
index d8790bbc8..d9a8409e1 100755
--- a/scripts/evergreen/setup_kubectl.sh
+++ b/scripts/evergreen/setup_kubectl.sh
@@ -25,7 +25,7 @@ mv kubectl "${bindir}"
 echo "Downloading helm for ${ARCH}"
 helm_archive="${tmpdir}/helm.tgz"
 helm_version="v3.17.1"
-curl -s https://get.helm.sh/helm-${helm_version}-linux-"${ARCH}".tar.gz --output "${helm_archive}"
+curl --retry 5 --fail --show-error --max-time 180 -s https://get.helm.sh/helm-${helm_version}-linux-"${ARCH}".tar.gz --output "${helm_archive}"
 
 tar xfz "${helm_archive}" -C "${tmpdir}" &> /dev/null
 mv "${tmpdir}/linux-${ARCH}/helm" "${bindir}"
diff --git a/scripts/evergreen/setup_mongosh.sh b/scripts/evergreen/setup_mongosh.sh
index 614da0b33..f81b15629 100755
--- a/scripts/evergreen/setup_mongosh.sh
+++ b/scripts/evergreen/setup_mongosh.sh
@@ -4,10 +4,12 @@ set -Eeou pipefail
 source scripts/dev/set_env_context.sh
 
 bindir="${workdir:?}/bin"
-mkdir -p "${bindir}"
+tmpdir="${workdir:?}/tmp"
+mkdir -p "${bindir}" "${tmpdir}"
 
-curl -s --retry 3 -LO "https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz"
-tar -zxvf mongosh-2.3.8-linux-x64.tgz
-cd mongosh-2.3.8-linux-x64/bin
+# Download mongosh archive
+curl --retry 5 --fail --show-error --max-time 180 --silent -LO "https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz"
+tar -zxvf mongosh-2.3.8-linux-x64.tgz -C "${tmpdir}"
+cd "${tmpdir}/mongosh-2.3.8-linux-x64/bin"
 ./mongosh --version
 mv mongosh "${bindir}"
diff --git a/scripts/evergreen/setup_prepare_openshift_bundles.sh b/scripts/evergreen/setup_prepare_openshift_bundles.sh
index d390e79c3..8c3c71281 100755
--- a/scripts/evergreen/setup_prepare_openshift_bundles.sh
+++ b/scripts/evergreen/setup_prepare_openshift_bundles.sh
@@ -33,7 +33,7 @@ fi
 
 # there is no mac build in for arm64
 opm_arch="amd64"
-curl -L --retry 3 -o opm.tar.gz "https://mirror.openshift.com/pub/openshift-v4/${opm_arch}/clients/ocp/latest-4.12/opm-${opm_os}.tar.gz"
+curl --retry 5 --fail --show-error --max-time 180 -L -o opm.tar.gz "https://mirror.openshift.com/pub/openshift-v4/${opm_arch}/clients/ocp/latest-4.12/opm-${opm_os}.tar.gz"
 
 # TODO: Sometimes tar is failing for unknown reasons in EVG. This is left intentionally. Remove if not causing problems anymore.
 ls -al opm.tar.gz
diff --git a/scripts/evergreen/setup_shellcheck.sh b/scripts/evergreen/setup_shellcheck.sh
index 577188e2c..a15774305 100755
--- a/scripts/evergreen/setup_shellcheck.sh
+++ b/scripts/evergreen/setup_shellcheck.sh
@@ -10,7 +10,7 @@ mkdir -p "${bindir}" "${tmpdir}"
 echo "Downloading shellcheck"
 shellcheck_archive="${tmpdir}/shellcheck.tar.xz"
 shellcheck_version="v0.9.0"
-curl --retry 3 --silent -L "https://github.com/koalaman/shellcheck/releases/download/${shellcheck_version}/shellcheck-${shellcheck_version}.linux.x86_64.tar.xz" -o "${shellcheck_archive}"
+curl --retry 5 --fail --show-error --max-time 180 --silent -L "https://github.com/koalaman/shellcheck/releases/download/${shellcheck_version}/shellcheck-${shellcheck_version}.linux.x86_64.tar.xz" -o "${shellcheck_archive}"
 tar -xf "${shellcheck_archive}" -C "${tmpdir}"
 mv "${tmpdir}/shellcheck-${shellcheck_version}/shellcheck" "${bindir}"
 rm "${shellcheck_archive}"
diff --git a/scripts/funcs/install b/scripts/funcs/install
index 978ed5275..882ec06f4 100644
--- a/scripts/funcs/install
+++ b/scripts/funcs/install
@@ -46,7 +46,7 @@ download_and_install_binary() {
 
   mkdir -p "${dir}"
   echo "Downloading ${url}"
-  curl --retry 3 --silent -L "${url}" -o "${bin}"
+  curl --retry 5 --fail --show-error --max-time 180 --silent -L "${url}" -o "${bin}"
   chmod +x "${bin}"
   mv "${bin}" "${dir}"
   echo "Installed ${bin} to ${dir}"

From 04396cb12853bd0637050c8c8a90966126c4292d Mon Sep 17 00:00:00 2001
From: Julien Benhaim <julien.benhaim@mongodb.com>
Date: Tue, 21 Oct 2025 14:57:49 +0200
Subject: [PATCH 2/5] Add 3s retry delay

---
 scripts/evergreen/lint_code.sh                       | 2 +-
 scripts/evergreen/setup_aws.sh                       | 2 +-
 scripts/evergreen/setup_gcloud_cli.sh                | 2 +-
 scripts/evergreen/setup_kubectl.sh                   | 2 +-
 scripts/evergreen/setup_mongosh.sh                   | 2 +-
 scripts/evergreen/setup_prepare_openshift_bundles.sh | 2 +-
 scripts/evergreen/setup_shellcheck.sh                | 2 +-
 scripts/funcs/install                                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/evergreen/lint_code.sh b/scripts/evergreen/lint_code.sh
index c554f9fd3..02096de71 100755
--- a/scripts/evergreen/lint_code.sh
+++ b/scripts/evergreen/lint_code.sh
@@ -7,7 +7,7 @@ required_version="v2.0.2"
 # Install or update golangci-lint if not installed or version is incorrect
 if ! [[ -x "$(command -v golangci-lint)" ]]; then
     echo "Installing/updating golangci-lint to version ${required_version}..."
-    curl --retry 5 --fail --show-error --max-time 180 -sSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin "${required_version}"
+    curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -sSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin "${required_version}"
 else
     echo "golangci-lint is already installed"
 fi
diff --git a/scripts/evergreen/setup_aws.sh b/scripts/evergreen/setup_aws.sh
index 8a88c1bf3..5eb01c143 100755
--- a/scripts/evergreen/setup_aws.sh
+++ b/scripts/evergreen/setup_aws.sh
@@ -19,7 +19,7 @@ install_aws_cli_binary() {
     cd "${temp_dir}"
 
     echo "Downloading AWS CLI v2 for ${aws_arch}..."
-    curl --retry 5 --fail --show-error --max-time 180 -s "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o "awscliv2.zip"
+    curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -s "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o "awscliv2.zip"
 
     unzip -q awscliv2.zip
     sudo ./aws/install --update
diff --git a/scripts/evergreen/setup_gcloud_cli.sh b/scripts/evergreen/setup_gcloud_cli.sh
index 273759654..6f3407bf9 100755
--- a/scripts/evergreen/setup_gcloud_cli.sh
+++ b/scripts/evergreen/setup_gcloud_cli.sh
@@ -3,7 +3,7 @@ set -Eeou pipefail
 
 source scripts/dev/set_env_context.sh
 
-curl --retry 5 --fail --show-error --max-time 180 --silent -LO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz"
+curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -LO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz"
 tar xf google-cloud-cli-linux-x86_64.tar.gz -C "${workdir}"
 "${workdir}"/google-cloud-sdk/install.sh --quiet
 source "${workdir}/google-cloud-sdk/path.bash.inc"
diff --git a/scripts/evergreen/setup_kubectl.sh b/scripts/evergreen/setup_kubectl.sh
index d9a8409e1..c3caf0e51 100755
--- a/scripts/evergreen/setup_kubectl.sh
+++ b/scripts/evergreen/setup_kubectl.sh
@@ -25,7 +25,7 @@ mv kubectl "${bindir}"
 echo "Downloading helm for ${ARCH}"
 helm_archive="${tmpdir}/helm.tgz"
 helm_version="v3.17.1"
-curl --retry 5 --fail --show-error --max-time 180 -s https://get.helm.sh/helm-${helm_version}-linux-"${ARCH}".tar.gz --output "${helm_archive}"
+curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -s https://get.helm.sh/helm-${helm_version}-linux-"${ARCH}".tar.gz --output "${helm_archive}"
 
 tar xfz "${helm_archive}" -C "${tmpdir}" &> /dev/null
 mv "${tmpdir}/linux-${ARCH}/helm" "${bindir}"
diff --git a/scripts/evergreen/setup_mongosh.sh b/scripts/evergreen/setup_mongosh.sh
index f81b15629..5c69db375 100755
--- a/scripts/evergreen/setup_mongosh.sh
+++ b/scripts/evergreen/setup_mongosh.sh
@@ -8,7 +8,7 @@ tmpdir="${workdir:?}/tmp"
 mkdir -p "${bindir}" "${tmpdir}"
 
 # Download mongosh archive
-curl --retry 5 --fail --show-error --max-time 180 --silent -LO "https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz"
+curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -LO "https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz"
 tar -zxvf mongosh-2.3.8-linux-x64.tgz -C "${tmpdir}"
 cd "${tmpdir}/mongosh-2.3.8-linux-x64/bin"
 ./mongosh --version
diff --git a/scripts/evergreen/setup_prepare_openshift_bundles.sh b/scripts/evergreen/setup_prepare_openshift_bundles.sh
index 8c3c71281..08cd0daa4 100755
--- a/scripts/evergreen/setup_prepare_openshift_bundles.sh
+++ b/scripts/evergreen/setup_prepare_openshift_bundles.sh
@@ -33,7 +33,7 @@ fi
 
 # there is no mac build in for arm64
 opm_arch="amd64"
-curl --retry 5 --fail --show-error --max-time 180 -L -o opm.tar.gz "https://mirror.openshift.com/pub/openshift-v4/${opm_arch}/clients/ocp/latest-4.12/opm-${opm_os}.tar.gz"
+curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -L -o opm.tar.gz "https://mirror.openshift.com/pub/openshift-v4/${opm_arch}/clients/ocp/latest-4.12/opm-${opm_os}.tar.gz"
 
 # TODO: Sometimes tar is failing for unknown reasons in EVG. This is left intentionally. Remove if not causing problems anymore.
 ls -al opm.tar.gz
diff --git a/scripts/evergreen/setup_shellcheck.sh b/scripts/evergreen/setup_shellcheck.sh
index a15774305..19748f3fd 100755
--- a/scripts/evergreen/setup_shellcheck.sh
+++ b/scripts/evergreen/setup_shellcheck.sh
@@ -10,7 +10,7 @@ mkdir -p "${bindir}" "${tmpdir}"
 echo "Downloading shellcheck"
 shellcheck_archive="${tmpdir}/shellcheck.tar.xz"
 shellcheck_version="v0.9.0"
-curl --retry 5 --fail --show-error --max-time 180 --silent -L "https://github.com/koalaman/shellcheck/releases/download/${shellcheck_version}/shellcheck-${shellcheck_version}.linux.x86_64.tar.xz" -o "${shellcheck_archive}"
+curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -L "https://github.com/koalaman/shellcheck/releases/download/${shellcheck_version}/shellcheck-${shellcheck_version}.linux.x86_64.tar.xz" -o "${shellcheck_archive}"
 tar -xf "${shellcheck_archive}" -C "${tmpdir}"
 mv "${tmpdir}/shellcheck-${shellcheck_version}/shellcheck" "${bindir}"
 rm "${shellcheck_archive}"
diff --git a/scripts/funcs/install b/scripts/funcs/install
index 882ec06f4..4ea74f77f 100644
--- a/scripts/funcs/install
+++ b/scripts/funcs/install
@@ -46,7 +46,7 @@ download_and_install_binary() {
 
   mkdir -p "${dir}"
   echo "Downloading ${url}"
-  curl --retry 5 --fail --show-error --max-time 180 --silent -L "${url}" -o "${bin}"
+  curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -L "${url}" -o "${bin}"
   chmod +x "${bin}"
   mv "${bin}" "${dir}"
   echo "Installed ${bin} to ${dir}"

From 344001d6d6c2035f4599834e9f47ce5a76fefb5a Mon Sep 17 00:00:00 2001
From: Julien Benhaim <julien.benhaim@mongodb.com>
Date: Tue, 21 Oct 2025 15:17:12 +0200
Subject: [PATCH 3/5] Retry all errors

---
 scripts/evergreen/lint_code.sh                       | 2 +-
 scripts/evergreen/setup_aws.sh                       | 2 +-
 scripts/evergreen/setup_gcloud_cli.sh                | 2 +-
 scripts/evergreen/setup_kubectl.sh                   | 2 +-
 scripts/evergreen/setup_mongosh.sh                   | 2 +-
 scripts/evergreen/setup_prepare_openshift_bundles.sh | 2 +-
 scripts/evergreen/setup_shellcheck.sh                | 2 +-
 scripts/funcs/install                                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/evergreen/lint_code.sh b/scripts/evergreen/lint_code.sh
index 02096de71..4cc7863cf 100755
--- a/scripts/evergreen/lint_code.sh
+++ b/scripts/evergreen/lint_code.sh
@@ -7,7 +7,7 @@ required_version="v2.0.2"
 # Install or update golangci-lint if not installed or version is incorrect
 if ! [[ -x "$(command -v golangci-lint)" ]]; then
     echo "Installing/updating golangci-lint to version ${required_version}..."
-    curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -sSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin "${required_version}"
+    curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 -sSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin "${required_version}"
 else
     echo "golangci-lint is already installed"
 fi
diff --git a/scripts/evergreen/setup_aws.sh b/scripts/evergreen/setup_aws.sh
index 5eb01c143..49d7eef4c 100755
--- a/scripts/evergreen/setup_aws.sh
+++ b/scripts/evergreen/setup_aws.sh
@@ -19,7 +19,7 @@ install_aws_cli_binary() {
     cd "${temp_dir}"
 
     echo "Downloading AWS CLI v2 for ${aws_arch}..."
-    curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -s "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o "awscliv2.zip"
+    curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 -s "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o "awscliv2.zip"
 
     unzip -q awscliv2.zip
     sudo ./aws/install --update
diff --git a/scripts/evergreen/setup_gcloud_cli.sh b/scripts/evergreen/setup_gcloud_cli.sh
index 6f3407bf9..fd39c5035 100755
--- a/scripts/evergreen/setup_gcloud_cli.sh
+++ b/scripts/evergreen/setup_gcloud_cli.sh
@@ -3,7 +3,7 @@ set -Eeou pipefail
 
 source scripts/dev/set_env_context.sh
 
-curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -LO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz"
+curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 --silent -LO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz"
 tar xf google-cloud-cli-linux-x86_64.tar.gz -C "${workdir}"
 "${workdir}"/google-cloud-sdk/install.sh --quiet
 source "${workdir}/google-cloud-sdk/path.bash.inc"
diff --git a/scripts/evergreen/setup_kubectl.sh b/scripts/evergreen/setup_kubectl.sh
index c3caf0e51..c30e39060 100755
--- a/scripts/evergreen/setup_kubectl.sh
+++ b/scripts/evergreen/setup_kubectl.sh
@@ -25,7 +25,7 @@ mv kubectl "${bindir}"
 echo "Downloading helm for ${ARCH}"
 helm_archive="${tmpdir}/helm.tgz"
 helm_version="v3.17.1"
-curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -s https://get.helm.sh/helm-${helm_version}-linux-"${ARCH}".tar.gz --output "${helm_archive}"
+curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 -s https://get.helm.sh/helm-${helm_version}-linux-"${ARCH}".tar.gz --output "${helm_archive}"
 
 tar xfz "${helm_archive}" -C "${tmpdir}" &> /dev/null
 mv "${tmpdir}/linux-${ARCH}/helm" "${bindir}"
diff --git a/scripts/evergreen/setup_mongosh.sh b/scripts/evergreen/setup_mongosh.sh
index 5c69db375..16d144c0d 100755
--- a/scripts/evergreen/setup_mongosh.sh
+++ b/scripts/evergreen/setup_mongosh.sh
@@ -8,7 +8,7 @@ tmpdir="${workdir:?}/tmp"
 mkdir -p "${bindir}" "${tmpdir}"
 
 # Download mongosh archive
-curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -LO "https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz"
+curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 --silent -LO "https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz"
 tar -zxvf mongosh-2.3.8-linux-x64.tgz -C "${tmpdir}"
 cd "${tmpdir}/mongosh-2.3.8-linux-x64/bin"
 ./mongosh --version
diff --git a/scripts/evergreen/setup_prepare_openshift_bundles.sh b/scripts/evergreen/setup_prepare_openshift_bundles.sh
index 08cd0daa4..5404d2ea9 100755
--- a/scripts/evergreen/setup_prepare_openshift_bundles.sh
+++ b/scripts/evergreen/setup_prepare_openshift_bundles.sh
@@ -33,7 +33,7 @@ fi
 
 # there is no mac build in for arm64
 opm_arch="amd64"
-curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 -L -o opm.tar.gz "https://mirror.openshift.com/pub/openshift-v4/${opm_arch}/clients/ocp/latest-4.12/opm-${opm_os}.tar.gz"
+curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 -L -o opm.tar.gz "https://mirror.openshift.com/pub/openshift-v4/${opm_arch}/clients/ocp/latest-4.12/opm-${opm_os}.tar.gz"
 
 # TODO: Sometimes tar is failing for unknown reasons in EVG. This is left intentionally. Remove if not causing problems anymore.
 ls -al opm.tar.gz
diff --git a/scripts/evergreen/setup_shellcheck.sh b/scripts/evergreen/setup_shellcheck.sh
index 19748f3fd..35347f5ef 100755
--- a/scripts/evergreen/setup_shellcheck.sh
+++ b/scripts/evergreen/setup_shellcheck.sh
@@ -10,7 +10,7 @@ mkdir -p "${bindir}" "${tmpdir}"
 echo "Downloading shellcheck"
 shellcheck_archive="${tmpdir}/shellcheck.tar.xz"
 shellcheck_version="v0.9.0"
-curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -L "https://github.com/koalaman/shellcheck/releases/download/${shellcheck_version}/shellcheck-${shellcheck_version}.linux.x86_64.tar.xz" -o "${shellcheck_archive}"
+curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 --silent -L "https://github.com/koalaman/shellcheck/releases/download/${shellcheck_version}/shellcheck-${shellcheck_version}.linux.x86_64.tar.xz" -o "${shellcheck_archive}"
 tar -xf "${shellcheck_archive}" -C "${tmpdir}"
 mv "${tmpdir}/shellcheck-${shellcheck_version}/shellcheck" "${bindir}"
 rm "${shellcheck_archive}"
diff --git a/scripts/funcs/install b/scripts/funcs/install
index 4ea74f77f..d55b638d0 100644
--- a/scripts/funcs/install
+++ b/scripts/funcs/install
@@ -46,7 +46,7 @@ download_and_install_binary() {
 
   mkdir -p "${dir}"
   echo "Downloading ${url}"
-  curl --retry 5 --retry-delay 3 --fail --show-error --max-time 180 --silent -L "${url}" -o "${bin}"
+  curl --retry 5 --retry-delay 3 --retry-all-errors --fail --show-error --max-time 180 --silent -L "${url}" -o "${bin}"
   chmod +x "${bin}"
   mv "${bin}" "${dir}"
   echo "Installed ${bin} to ${dir}"

From 791ee5aa3c04db6f12da861aad15cd6bbc9044f4 Mon Sep 17 00:00:00 2001
From: Julien Benhaim <julien.benhaim@mongodb.com>
Date: Tue, 21 Oct 2025 16:24:39 +0200
Subject: [PATCH 4/5] Bump MCO distro to 2404

---
 .evergreen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index f99cc4c41..bc725c555 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -1666,7 +1666,7 @@ buildvariants:
     tags: [ "pr_patch", "staging", "e2e_mco_test_suite" ]
     <<: *community_dependency
     run_on:
-      - ubuntu2004-large
+      - ubuntu2404-large
 
   ## Manual (patch) E2E tests not run for every PR and commit
 

From 2d225bd4f4d8cab30d099e414c5709561ecee588 Mon Sep 17 00:00:00 2001
From: Julien Benhaim <julien.benhaim@mongodb.com>
Date: Wed, 22 Oct 2025 09:17:19 +0200
Subject: [PATCH 5/5] Bump e2e_operator_race_ubi_with_telemetry linux distro to
 2404

---
 .evergreen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index bc725c555..849e37145 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -1389,7 +1389,7 @@ buildvariants:
     display_name: e2e_operator_race_ubi_with_telemetry
     tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
-      - ubuntu1804-xlarge
+      - ubuntu2404-xlarge
     <<: *base_om7_dependency_with_race
     tasks:
       - name: e2e_operator_race_with_telemetry_task_group