From 158e5882e9ad8ace49bac170b0aa8dbca69d5fb1 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 1 Mar 2024 16:46:59 +0000
Subject: [PATCH] ci/lavapipe: fold `DEQP_VER: vk` and drop .deqp-test-vk

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27936>
---
 .gitlab-ci/test/gitlab-ci.yml                       | 6 ------
 src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml | 1 +
 src/gallium/frontends/lavapipe/ci/gitlab-ci.yml     | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index a275deeced3..f18c8490876 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -171,12 +171,6 @@ python-test:
     reports:
       junit: results/junit.xml
 
-.deqp-test-vk:
-  extends:
-    - .deqp-test
-  variables:
-    DEQP_VER: vk
-
 .fossilize-test:
   script:
     - ./install/fossilize-runner.sh
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml
index 7f491c26148..30c25a48b5a 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml
@@ -30,5 +30,6 @@
   variables:
     GPU_VERSION: lvp
     VK_DRIVER: lvp
+    DEQP_VER: vk
     DEQP_EXPECTED_RENDERER: llvmpipe
     LVP_POISON_MEMORY: "1"
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
index 87d4e486838..5f0432da5df 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -8,12 +8,12 @@ lavapipe:
     DEQP_FRACTION: 18
   stage: software-renderer
   extends:
-    - .deqp-test-vk
+    - .deqp-test
     - .lavapipe-test
 
 lavapipe-vk-asan:
   extends:
-    - .deqp-test-vk
+    - .deqp-test
     - .lavapipe-test
   variables:
     GPU_VERSION: lvp-asan