ci/lavapipe: fold DEQP_VER: vk and drop .deqp-test-vk

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27936>
2026-05-06 00:49:04 +02:00 · 2024-03-01 16:46:59 +00:00 · 2024-03-01 16:46:59 +00:00 · 158e5882e9
commit 158e5882e9
parent 54254ae3f2
3 changed files with 3 additions and 8 deletions
--- 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
--- 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"
--- 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