From 645f752c60749f5091463d9ae340f980fb9128ab Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Wed, 2 Jul 2025 11:45:17 +0200
Subject: [PATCH] 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>
---
 .gitlab-ci/container/fdo_cntr_export.sh |  1 +
 .gitlab-ci/image-tags.yml               |  2 +-
 .gitlab-ci/lava/lava-submit.sh          | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/fdo_cntr_export.sh b/.gitlab-ci/container/fdo_cntr_export.sh
index fdb132bb064..b0b04ad8775 100644
--- a/.gitlab-ci/container/fdo_cntr_export.sh
+++ b/.gitlab-ci/container/fdo_cntr_export.sh
@@ -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"
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 91b07b8d5b9..6d0e827daa4 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -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"
 
diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index f445b66aa91..02cfd3fe06c 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -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