ci/lava: Make Fluster vectors an optional overlay

Remove the Fluster vectors from the core LAVA rootfs, and only deploy
them when necessary.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35880>
This commit is contained in:
Valentine Burley
2025-07-02 11:45:17 +02:00
committed by Marge Bot
parent f35c5cfabb
commit 645f752c60
3 changed files with 12 additions and 1 deletions

View File

@@ -49,6 +49,7 @@ buildah_export() {
# so remove them from the core rootfs
rm -rf "${mountpoint}/android-cts"
rm -rf "${mountpoint}/cuttlefish"
rm -rf "${mountpoint}/fluster/resources"
rm -rf "${mountpoint}/vkd3d-proton-tests"
rm -rf "${mountpoint}/vkd3d-proton-wine64"

View File

@@ -30,7 +30,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "20250722-libwayland"
ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250804-init"
ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250813-fluster"
FEDORA_X86_64_BUILD_TAG: "20250722-libwayland"

View File

@@ -79,6 +79,16 @@ if [ -n "${ANDROID_CTS_TAG:-}" ]; then
--compression=zstd
)
fi
if [ -n "${FLUSTER_TAG:-}" ]; then
LAVA_EXTRA_OVERLAYS+=(
- append-overlay
--name=vkd3d-proton
--url="$(find_s3_project_artifact "${DATA_STORAGE_PATH}/fluster/${FLUSTER_TAG}/vectors.tar.zst")"
--path="/"
--format=tar
--compression=zstd
)
fi
if [ -n "${VKD3D_PROTON_TAG:-}" ]; then
LAVA_EXTRA_OVERLAYS+=(
- append-overlay