From 3ca7897ba90740485c7420b844769ba79232fd6f Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Thu, 1 May 2025 12:24:04 +0200
Subject: [PATCH] ci/fluster: Move Fluster to its own subfolder in the
 test-video container

We have a spacious new container, move fluster to its own subfolder.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>
---
 .gitlab-ci/container/build-fluster.sh | 8 ++++----
 .gitlab-ci/fluster-runner.sh          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/container/build-fluster.sh b/.gitlab-ci/container/build-fluster.sh
index 91bd9ff57fb..28e7a16dc8a 100644
--- a/.gitlab-ci/container/build-fluster.sh
+++ b/.gitlab-ci/container/build-fluster.sh
@@ -8,11 +8,11 @@
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_TEST_VIDEO_TAG
 
-# Install fluster in /usr/local.
+# Install fluster in /fluster.
 
 set -uex
 
-section_start fluster "Install fluster"
+section_start fluster "Installing fluster"
 
 FLUSTER_REVISION="e997402978f62428fffc8e5a4a709690d9ca9bc5"
 
@@ -54,11 +54,11 @@ if ! $SKIP_UPDATE_FLUSTER_VECTORS; then
       "https://${S3_PATH_FLUSTER}/vectors.tar.zst"
 fi
 
-mv fluster/ /usr/local/
+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 /usr/local/
+      "${FDO_HTTP_CACHE_URI:-}https://${S3_PATH_FLUSTER}" | tar --zstd -x -C /
 fi
 
 section_end fluster
diff --git a/.gitlab-ci/fluster-runner.sh b/.gitlab-ci/fluster-runner.sh
index 5cb04989cb0..3ea57648b33 100755
--- a/.gitlab-ci/fluster-runner.sh
+++ b/.gitlab-ci/fluster-runner.sh
@@ -63,7 +63,7 @@ set +e
 
 fluster-runner \
         run \
-        --fluster /usr/local/fluster/fluster.py \
+        --fluster /fluster/fluster.py \
         --output ${RESULTS} \
         --jobs ${FDO_CI_CONCURRENT:-4} \
         --skips ${FLUSTER_SKIPS} \