From c90e1ba5cc3c06b32d85795871302f99c9ca963a Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Thu, 1 May 2025 12:02:39 +0200
Subject: [PATCH] ci/test: Move and rename .lava-fluster to .test-fluster

It has nothing to do with LAVA, it just happens that the first fluster
job was running on LAVA.

Also drop the redundant :x86_64 definition.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>
---
 .gitlab-ci/lava/lava-gitlab-ci.yml | 10 ----------
 .gitlab-ci/test/gitlab-ci.yml      |  5 +++++
 src/amd/ci/gitlab-ci-inc.yml       |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 590c1f6b4b5..36cb4a6f5f9 100644
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -195,13 +195,3 @@ variables:
   extends:
     - .lava-arm64-test-gl
     - .lava-piglit-traces
-
-.lava-fluster:
-  variables:
-    FLUSTER_RESULTS: "${GPU_VERSION}-${FLUSTER_CODEC}"
-    HWCI_TEST_SCRIPT: "/install/fluster/fluster-runner.sh"
-
-.lava-fluster:x86_64:
-  extends:
-    - .lava-fluster
-
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 08a390952b4..6aff6542bc4 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -183,6 +183,11 @@ yaml-toml-shell-py-test:
   variables:
     ANGLE_TAG: ${CONDITIONAL_BUILD_ANGLE_TAG}
 
+.test-fluster:
+  variables:
+    FLUSTER_RESULTS: "${GPU_VERSION}-${FLUSTER_CODEC}"
+    HWCI_TEST_SCRIPT: "/install/fluster/fluster-runner.sh"
+
 .test-piglit:
   variables:
     PIGLIT_TAG: ${CONDITIONAL_BUILD_PIGLIT_TAG}
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index fef66719454..ea4ee74f750 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -466,7 +466,7 @@
 ############### Fluster tests ###############
 .radeonsi-raven-vaapi-fluster:
   extends:
-    - .lava-fluster:x86_64
+    - .test-fluster
   rules:
     - !reference [.radeonsi-vaapi-rules, rules]
     - changes: