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

@@ -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

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"

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