Make SkillsBench curl retry flag compatible (#1738)

Author: huangruiteng

examples/skillsbench-benchmark-run-smoke.py

@@ -5893,13 +5893,14 @@ def test_skillsbench_docker_task_staging_rewrites_wget_gpg_key_download() -> Non
             encoding="utf-8"
         )
         assert "wget -qO -" not in staged_text, staged_text
+        curl_retry_all_errors_arg = skillsbench_loop._dockerfile_curl_retry_all_errors_arg()
         assert (
-            "curl -fsSL --retry 8 --retry-all-errors --retry-delay 3 "
+            f"curl -fsSL --retry 8 {curl_retry_all_errors_arg} --retry-delay 3 "
             "--connect-timeout 60 --max-time 300 "
             "https://example.invalid/public.key | gpg --dearmor"
         ) in staged_text, staged_text
         assert (
-            "curl -fsSL --retry 8 --retry-all-errors --retry-delay 3 "
+            f"curl -fsSL --retry 8 {curl_retry_all_errors_arg} --retry-delay 3 "
             "--connect-timeout 60 --max-time 300 "
             "https://aquasecurity.github.io/trivy-repo/deb/public.key | "
             "gpg --dearmor"
@@ -5987,7 +5988,7 @@ def test_skillsbench_docker_task_staging_hardens_build_downloads() -> None:
             "apache-druid-0.20.0-bin.tar.gz"
         ) in staged_text, staged_text
         assert (
-            "curl -fL --retry 5 --retry-all-errors --retry-delay 2 "
+            f"curl -fL --retry 5 {skillsbench_loop._dockerfile_curl_retry_all_errors_arg()} --retry-delay 2 "
             "--connect-timeout 60 --max-time 600 "
             "https://github.com/coursier/coursier/releases/download/"
             "v2.1.25-M23/cs-x86_64-pc-linux.gz"
@@ -6043,7 +6044,7 @@ def test_skillsbench_docker_task_staging_patches_dockerfile_uv_bootstrap() -> No
         ), staged_text
         assert "uv==${LOOPX_SKILLSBENCH_UV_VERSION}" in staged_text, staged_text
         assert "INSTALLER_DOWNLOAD_URL" in staged_text, staged_text
-        assert "--retry-all-errors" in staged_text, staged_text
+        assert skillsbench_loop._dockerfile_curl_retry_all_errors_arg() in staged_text, staged_text
         assert (
             "curl -LsSf https://astral.sh/uv/0.9.22/install.sh | sh &&"
             not in staged_text

scripts/skillsbench_automation_loop.py

@@ -6991,6 +6991,10 @@ def _dockerfile_instruction_block_end(lines: list[str], start: int) -> int:
     return end
 
 
+def _dockerfile_curl_retry_all_errors_arg() -> str:
+    return "$(curl --help all 2>/dev/null | grep -q -- '--retry-all-errors' && printf '%s' '--retry-all-errors' || true)"
+
+
 def patch_dockerfile_uv_bootstrap_mirror(dockerfile: Path) -> dict[str, Any]:
     """Make staged Dockerfile uv bootstraps tolerate installer egress failures."""
 
@@ -7034,7 +7038,7 @@ def patch_dockerfile_uv_bootstrap_mirror(dockerfile: Path) -> dict[str, Any]:
         "    fi; \\\n"
         "    if ! command -v uvx >/dev/null 2>&1; then \\\n"
         "      export INSTALLER_DOWNLOAD_URL=\"${LOOPX_SKILLSBENCH_UV_RELEASE_MIRROR}/${LOOPX_SKILLSBENCH_UV_VERSION}\"; \\\n"
-        "      curl -LsSf --retry 5 --retry-all-errors --retry-delay 2 --connect-timeout 30 \\\n"
+        f"      curl -LsSf --retry 5 {_dockerfile_curl_retry_all_errors_arg()} --retry-delay 2 --connect-timeout 30 \\\n"
         "        \"https://astral.sh/uv/${LOOPX_SKILLSBENCH_UV_VERSION}/install.sh\" | sh; \\\n"
         "    fi; \\\n"
         "    if [ -x \"${HOME}/.local/bin/uv\" ]; then install -m 0755 \"${HOME}/.local/bin/uv\" /usr/local/bin/uv; fi; \\\n"
@@ -7171,7 +7175,8 @@ def patch_dockerfile_wget_gpg_key_retry(dockerfile: Path) -> bool:
 
     def gpg_key_curl_command(url: str) -> str:
         return (
-            "curl -fsSL --retry 8 --retry-all-errors --retry-delay 3 "
+            "curl -fsSL --retry 8 "
+            f"{_dockerfile_curl_retry_all_errors_arg()} --retry-delay 3 "
             f"--connect-timeout 60 --max-time 300 {url} | gpg --dearmor"
         )
 
@@ -7338,7 +7343,7 @@ def replace_curl(match: re.Match[str]) -> str:
             return match.group(0)
         return (
             "curl"
-            f"{args} --retry 5 --retry-all-errors --retry-delay 2 "
+            f"{args} --retry 5 {_dockerfile_curl_retry_all_errors_arg()} --retry-delay 2 "
             f"--connect-timeout 60 --max-time 600 {match.group('url')}"
         )