From 10ea0002a6f725c4c66e665c82620dda1ba1d681 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Wed, 9 Apr 2025 13:34:58 +0200
Subject: [PATCH] ci/intel: Convert to using the new container based rootfs

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34451>
---
 src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml |  2 +-
 src/gallium/drivers/zink/ci/gitlab-ci-inc.yml  |  2 ++
 src/intel/ci/gitlab-ci-inc.yml                 | 12 ++++++++----
 src/intel/ci/gitlab-ci.yml                     |  3 +++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
index 958bc6d921f..acb8e08836d 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
@@ -41,7 +41,7 @@
     LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release
     S3_ARTIFACT_NAME: mesa-python-ci-artifacts
   needs:
-    - kernel+rootfs_x86_64
+    - debian/x86_64_test-gl
     - debian-release
 
 .virpipe-test:
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index 1fe0a124f56..5484ff63da5 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -184,6 +184,7 @@
 
 .zink-anv-adl-test:
   extends:
+    - .lava-x86_64-test-gl
     - .anv-test
     - .lava-acer-cbv514-1h-34uz-brya:x86_64
     - .zink-anv-rules
@@ -205,6 +206,7 @@
 
 .zink-anv-tgl-test:
   extends:
+    - .lava-x86_64-test-gl
     - .anv-test
     - .lava-acer-cp514-2h-1160g7-volteer:x86_64
     - .zink-anv-rules
diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index 730f481d7c9..0f85531ff2d 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -131,7 +131,7 @@
     LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release
     S3_ARTIFACT_NAME: mesa-python-ci-artifacts
   needs:
-    - kernel+rootfs_x86_64
+    - debian/x86_64_test-gl
     - debian-release
 
 .anv-rules:
@@ -337,8 +337,6 @@
 
 
 .intel-common-test:
-  extends:
-    - .lava-test-deqp:x86_64
   variables:
     DTB: ""
     BOOT_METHOD: depthcharge
@@ -356,6 +354,7 @@
 
 .iris-test:
   extends:
+    - .lava-x86_64-test-gl
     - .intel-common-test
     - .iris-rules
   variables:
@@ -369,7 +368,9 @@
 ## ANV only
 .anv-angle-test:
   extends:
-    - .anv-test
+    - .lava-x86_64-test-gl
+    - .intel-common-test
+    - .anv-rules
     - .test-angle
   variables:
     VK_DRIVER: intel
@@ -468,6 +469,7 @@
 ## Intel (anv + iris)
 .intel-adl-test:
   extends:
+    - .lava-x86_64-test-gl
     - .anv-test
     - .intel-test
   variables:
@@ -475,6 +477,7 @@
 
 .intel-tgl-test:
   extends:
+    - .lava-x86_64-test-gl
     - .anv-test
     - .intel-test
   variables:
@@ -482,6 +485,7 @@
 
 .intel-whl-test:
   extends:
+    - .lava-x86_64-test-gl
     - .iris-whl-test
     - .intel-test
   variables:
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index 6a0881b7504..771e534aacc 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -3,6 +3,7 @@ include:
 
 anv-jsl-vk:
   extends:
+    - .lava-x86_64-test-vk
     - .anv-test
     - .lava-acer-cb317-1h-c3z6-dedede:x86_64
   variables:
@@ -21,6 +22,7 @@ anv-jsl-vk-full:
 
 anv-adl-vk:
   extends:
+    - .lava-x86_64-test-vk
     - .anv-test
     - .lava-acer-cbv514-1h-34uz-brya:x86_64
   variables:
@@ -40,6 +42,7 @@ anv-adl-vk-full:
 
 anv-tgl-vk:
   extends:
+    - .lava-x86_64-test-vk
     - .anv-test
     - .lava-acer-cp514-2h-1160g7-volteer:x86_64
   variables: