From c66d4a329bbff6e64e737c8800d3f832fc2f876d Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Fri, 25 Jul 2025 09:48:28 +0200
Subject: [PATCH] radeonsi/ci: Increase Fluster job concurrency

Fluster appears to scale well with additional threads, so bump the
concurrency, which allows reducing the `parallel`.

This is achieved by making the `radeonsi-raven-vaapi-fluster` job
not extend the `radeonsi-raven-va` job, which was setting
`FDO_CI_CONCURRENT: 1`

Also drop the timeout, as it shouldn't be set for LAVA jobs here,
and move the rules definition next to the other rules.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36369>
---
 src/amd/ci/gitlab-ci-inc.yml | 24 ++++++++++++------------
 src/amd/ci/gitlab-ci.yml     |  7 +++----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index aa584df72ab..f98f986631e 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -138,6 +138,18 @@
         *radeon_vcn_file_list
       when: manual
 
+.radeonsi-vaapi-fluster-rules:
+  stage: amd
+  extends:
+    - .test-fluster
+  rules:
+    - !reference [.radeonsi-vaapi-rules, rules]
+    - changes:
+        - src/amd/ci/$GPU_VERSION-fluster-fails.txt
+        - src/amd/ci/$GPU_VERSION-fluster-flakes.txt
+        - src/amd/ci/$GPU_VERSION-fluster-skips.txt
+      when: on_success
+
 .radeonsi-valve-rules:
   stage: amd
   rules:
@@ -496,15 +508,3 @@
     CI_TRON_DUT_SETUP_TAGS: amdgpu:codename:NAVI48
     GPU_VERSION: radv-gfx1201
     FDO_CI_CONCURRENT: 16  # FIXME: Replace with 32 when the zerovram regression is addressed
-
-############### Fluster tests ###############
-.radeonsi-vaapi-fluster-rules:
-  extends:
-    - .test-fluster
-  rules:
-    - !reference [.radeonsi-vaapi-rules, rules]
-    - changes:
-        - src/amd/ci/$GPU_VERSION-fluster-fails.txt
-        - src/amd/ci/$GPU_VERSION-fluster-flakes.txt
-        - src/amd/ci/$GPU_VERSION-fluster-skips.txt
-      when: on_success
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 376525ff06f..940e88edac9 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -142,14 +142,13 @@ radeonsi-raven-va:
 
 radeonsi-raven-vaapi-fluster:
   extends:
-    - radeonsi-raven-va
+    - .lava-x86_64-test-video
+    - .radeonsi-raven-test:x86_64
     - .radeonsi-vaapi-fluster-rules
-  timeout: 30m
-  parallel: 2
+    - .lava-hp-x360-14a-cb0001xx-zork:x86_64
   variables:
     DEQP_SUITE: fluster-vaapi
     GPU_VERSION: radeonsi-raven-fluster
-    HWCI_TEST_SCRIPT: install/deqp-runner.sh
 
 radeonsi-mendocino-glcts-piglit:
   extends: