ci/fluster: Fix and rename S3_PATH_FLUSTER to S3_FLUSTER_TAR

The S3_PATH_FLUSTER variable already included the archive filename.
Appending `vectors.tar.zst` again during upload caused the file to be
stored at the wrong location, which broke retrieval in subsequent builds.

Fix this behavior and rename the variable to S3_FLUSTER_TAR to make its
purpose clearer and avoid future confusion.

Fixes: a3fb667b1d ("ci: Include Fluster vectors in the rootfs")

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>

.gitlab-ci/conditional-build-image-tags.yml

@@ -1,4 +1,4 @@
 variables:
   CONDITIONAL_BUILD_ANGLE_TAG: 384145a4023315dae658259bee07c43a
-  CONDITIONAL_BUILD_FLUSTER_TAG: 6f28ab2217c79b336908b9e28d6a532c
+  CONDITIONAL_BUILD_FLUSTER_TAG: f1af06c34ccdbb5b44f78adaeb63603c
   CONDITIONAL_BUILD_PIGLIT_TAG: a19e424b8a3f020dbf1b9dd29f220a4f

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

@@ -26,9 +26,9 @@ export SKIP_UPDATE_FLUSTER_VECTORS=false
 
 check_fluster()
 {
-    S3_PATH_FLUSTER="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DATA_STORAGE_PATH}/fluster/${FLUSTER_TAG}/vectors.tar.zst"
+    S3_FLUSTER_TAR="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DATA_STORAGE_PATH}/fluster/${FLUSTER_TAG}/vectors.tar.zst"
     if curl -L --retry 4 -f --retry-connrefused --retry-delay 30 -s --head \
-      "https://${S3_PATH_FLUSTER}"; then
+      "https://${S3_FLUSTER_TAR}"; then
         echo "Fluster vectors are up-to-date, skip rebuilding them."
         export SKIP_UPDATE_FLUSTER_VECTORS=true
     fi
@@ -54,15 +54,14 @@ if ! $SKIP_UPDATE_FLUSTER_VECTORS; then
 
     # Build fluster vectors archive and upload it
     tar --zstd -cf "vectors.tar.zst" fluster/resources/
-    ci-fairy s3cp --token-file "${S3_JWT_FILE}" "vectors.tar.zst" \
-      "https://${S3_PATH_FLUSTER}/vectors.tar.zst"
+    ci-fairy s3cp --token-file "${S3_JWT_FILE}" "vectors.tar.zst" "https://${S3_FLUSTER_TAR}"
 fi
 
 mv fluster/ /
 
 if $SKIP_UPDATE_FLUSTER_VECTORS; then
     curl -L --retry 4 -f --retry-connrefused --retry-delay 30 \
-      "${FDO_HTTP_CACHE_URI:-}https://${S3_PATH_FLUSTER}" | tar --zstd -x -C /
+      "${FDO_HTTP_CACHE_URI:-}https://${S3_FLUSTER_TAR}" | tar --zstd -x -C /
 fi
 
 section_end fluster