AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/fluster: Fix and rename S3_PATH_FLUSTER to S3_FLUSTER_TAR

Browse Source 
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>
This commit is contained in:
Valentine Burley
2025-05-03 16:03:13 +02:00
parent 4a614cfbfb
commit e7ce35f3c5
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/conditional-build-image-tags.yml
View File

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

9
.gitlab-ci/container/build-fluster.sh
View File

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