diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 8cbdfeaae03..0bcff1765b6 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,4 +1,4 @@ variables: CONDITIONAL_BUILD_ANGLE_TAG: 384145a4023315dae658259bee07c43a - CONDITIONAL_BUILD_FLUSTER_TAG: 3cef43c49c9aa9cda3cc1584ea43cb8b + CONDITIONAL_BUILD_FLUSTER_TAG: 6f28ab2217c79b336908b9e28d6a532c CONDITIONAL_BUILD_PIGLIT_TAG: a19e424b8a3f020dbf1b9dd29f220a4f diff --git a/.gitlab-ci/container/build-fluster.sh b/.gitlab-ci/container/build-fluster.sh index 051d438f7af..c1f263cfbff 100644 --- a/.gitlab-ci/container/build-fluster.sh +++ b/.gitlab-ci/container/build-fluster.sh @@ -26,7 +26,7 @@ export SKIP_UPDATE_FLUSTER_VECTORS=false check_fluster() { - S3_PATH_FLUSTER="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DATA_STORAGE_PATH}/fluster/${FLUSTER_VECTORS_VERSION}/vectors.tar.zst" + S3_PATH_FLUSTER="${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 echo "Fluster vectors are up-to-date, skip rebuilding them." diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index c7ad50bd9bf..bdcc9ffd8f0 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -25,7 +25,7 @@ variables: DEBIAN_TEST_ANDROID_TAG: "20250502-depot-57" DEBIAN_TEST_GL_TAG: "20250502-depot-57" - DEBIAN_TEST_VIDEO_TAG: "20250423-rootfs" + DEBIAN_TEST_VIDEO_TAG: "20250503-fluster" DEBIAN_TEST_VK_TAG: "20250423-rootfs" DEBIAN_PYUTILS_TAG: "20250422-ci-fairy" @@ -38,8 +38,6 @@ variables: KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "95bf62c" - FLUSTER_VECTORS_VERSION: "5" - WINDOWS_X64_MSVC_TAG: "20250129-llvm19" WINDOWS_X64_BUILD_TAG: "20250129-llvm19"