From 39d68d12f347191446fbcc9fcc35fe4c59d73bc6 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 21 Mar 2025 21:34:11 +0100
Subject: [PATCH] ci: do a regular GET request for /done files, instead of HEAD

The s3 proxy bug that required this commit was fixed [1], but since
these /done files are empty, there's no benefit to using HEAD requests.

[1]: https://gitlab.freedesktop.org/freedesktop/helm-gitlab-deployment/-/commit/5acad8b02cd4cd84cc94c76bcc403629c2ce8f98

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34120>
---
 .gitlab-ci/container/baremetal_build.sh | 2 +-
 .gitlab-ci/container/lava_build.sh      | 4 ++--
 .gitlab-ci/fluster/fluster-runner.sh    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index 7eabe3b09b6..9fed2539ce0 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -7,7 +7,7 @@ set -o xtrace
 # network transfer, disk usage, and runtime on test jobs)
 
 # shellcheck disable=SC2154 # arch is assigned in previous scripts
-if curl --fail -L -X HEAD -s "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
+if curl --fail -L -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}"
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index a4579d75774..320512a5acf 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -25,7 +25,7 @@ export SKIP_UPDATE_FLUSTER_VECTORS=0
 check_minio()
 {
     S3_PATH="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
-    if curl -L --retry 4 -f --retry-delay 60 -s -X HEAD \
+    if curl -L --retry 4 -f --retry-delay 60 -s \
       "https://${S3_PATH}/done"; then
         echo "Remote files are up-to-date, skip rebuilding them."
         exit
@@ -35,7 +35,7 @@ check_minio()
 check_fluster()
 {
     S3_PATH_FLUSTER="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DATA_STORAGE_PATH}/fluster/${FLUSTER_VECTORS_VERSION}"
-    if curl -L --retry 4 -f --retry-delay 60 -s -X HEAD \
+    if curl -L --retry 4 -f --retry-delay 60 -s \
       "https://${S3_PATH_FLUSTER}/done"; then
         echo "Fluster vectors are up-to-date, skip downloading them."
         export SKIP_UPDATE_FLUSTER_VECTORS=1
diff --git a/.gitlab-ci/fluster/fluster-runner.sh b/.gitlab-ci/fluster/fluster-runner.sh
index ead20bd5cc8..022dc7caf31 100755
--- a/.gitlab-ci/fluster/fluster-runner.sh
+++ b/.gitlab-ci/fluster/fluster-runner.sh
@@ -16,7 +16,7 @@ fi
 # Check which fluster vectors to get
 FLUSTER_VECTORS_HOST_PATH="${STORAGE_MAINLINE_HOST_PATH}/fluster/${FLUSTER_VECTORS_VERSION}"
 if [ "$CI_PROJECT_PATH" != "$FDO_UPSTREAM_REPO" ]; then
-  if ! curl -s -X HEAD -L --retry 4 -f --retry-delay 60 "https://${FLUSTER_VECTORS_HOST_PATH}/done"; then
+  if ! curl -s -L --retry 4 -f --retry-delay 60 "https://${FLUSTER_VECTORS_HOST_PATH}/done"; then
     echo "Using Fluster vectors from the fork, cached from mainline is unavailable."
     FLUSTER_VECTORS_HOST_PATH="${STORAGE_FORK_HOST_PATH}/fluster/${FLUSTER_VECTORS_VERSION}"
   else