From 9870512787b9ee9c82ddb2237f6426fa74a4c4c4 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Wed, 9 Apr 2025 13:14:56 +0200
Subject: [PATCH] ci/lava: Use the new test-video-based rootfs for VA-API jobs

Add new job definitions using the new debian/x86_64-test-video container,
and convert the radeonsi-raven-va and radeonsi-raven-vaapi-fluster jobs
to use the rootfs derived from this container.
Now that we are no longer downloading the Fluster vectors at runtime, the
parallelsim of the radeonsi-raven-vaapi-fluster job can be greatly
decreased.

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

diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 5a53e8dd58c..94ce2180c26 100644
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -88,6 +88,16 @@ variables:
     - job: debian/x86_64_test-gl
       artifacts: false
 
+.lava-x86_64-test-video:
+  variables:
+    LAVA_DISTRIBUTION_TAG: !reference [debian/x86_64_test-video, variables, LAVA_DISTRIBUTION_TAG]
+  extends:
+    - .lava-x86_64-test
+  needs:
+    - !reference [.lava-x86_64-test, needs]
+    - job: debian/x86_64_test-video
+      artifacts: false
+
 .lava-x86_64-test-vk:
   variables:
     LAVA_DISTRIBUTION_TAG: !reference [debian/x86_64_test-vk, variables, LAVA_DISTRIBUTION_TAG]
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 5b9bdc01499..1b6df1c9e56 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -130,7 +130,7 @@ radeonsi-raven-cdna-lower-image-piglit:
 
 radeonsi-raven-va:
   extends:
-    - .lava-test-deqp:x86_64
+    - .lava-x86_64-test-video
     - .radeonsi-raven-test:x86_64
     - .radeonsi-vaapi-rules
     - .lava-hp-x360-14a-cb0001xx-zork:x86_64
@@ -150,7 +150,7 @@ radeonsi-raven-vaapi-fluster:
     - radeonsi-raven-va
     - .radeonsi-raven-vaapi-fluster
   timeout: 30m
-  parallel: 6
+  parallel: 2
   variables:
     FLUSTER_CODECS: VP9 H.264 H.265
     # FIXME: Downloading the vectors can take about 4-5 minutes