From 46abb7bd2eb543380c64cca7f9ca97263c86f553 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Thu, 1 May 2025 12:08:35 +0200
Subject: [PATCH] ci/fluster: Move the fluster-runner.sh script

The fluster-runner.sh was only runner srcipt in a folder, move it out of
the fluster folder.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>
---
 .gitlab-ci/{fluster => }/fluster-runner.sh | 0
 .gitlab-ci/prepare-artifacts.sh            | 1 -
 .gitlab-ci/test/gitlab-ci.yml              | 2 +-
 src/amd/ci/gitlab-ci-inc.yml               | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename .gitlab-ci/{fluster => }/fluster-runner.sh (100%)

diff --git a/.gitlab-ci/fluster/fluster-runner.sh b/.gitlab-ci/fluster-runner.sh
similarity index 100%
rename from .gitlab-ci/fluster/fluster-runner.sh
rename to .gitlab-ci/fluster-runner.sh
diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index 7ce5e874877..6be7bbb2e69 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -36,7 +36,6 @@ echo "$(cat VERSION) (git-$git_sha)" > install/VERSION
 cp -Rp .gitlab-ci/bare-metal install/
 cp -Rp .gitlab-ci/common install/
 cp -Rp .gitlab-ci/piglit install/
-cp -Rp .gitlab-ci/fluster install/
 cp -Rp .gitlab-ci/fossils.yml install/
 cp -Rp .gitlab-ci/fossils install/
 cp -Rp .gitlab-ci/fossilize-runner.sh install/
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 6aff6542bc4..f69f61b87f3 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -186,7 +186,7 @@ yaml-toml-shell-py-test:
 .test-fluster:
   variables:
     FLUSTER_RESULTS: "${GPU_VERSION}-${FLUSTER_CODEC}"
-    HWCI_TEST_SCRIPT: "/install/fluster/fluster-runner.sh"
+    HWCI_TEST_SCRIPT: install/fluster-runner.sh
 
 .test-piglit:
   variables:
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 6e6f36ea024..3364cbc298b 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -470,7 +470,6 @@
   rules:
     - !reference [.radeonsi-vaapi-rules, rules]
     - changes:
-        - .gitlab-ci/fluster/*
         - src/amd/ci/$GPU_VERSION-fluster-fails.txt
         - src/amd/ci/$GPU_VERSION-fluster-flakes.txt
         - src/amd/ci/$GPU_VERSION-fluster-skips.txt