ci: simplify debian-rusticl-testing definition

This was originally split due testing both rusticl and clover.

Reviewed-by: Martin Roukala <martin.roukala@mupuf.org>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25843>
This commit is contained in:
David Heidelberg
2023-10-22 12:14:07 +02:00
committed by Marge Bot
parent 1f2b50fbc2
commit ef217a9221

View File

@@ -133,32 +133,27 @@ debian-testing-msan:
GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus" GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
VULKAN_DRIVERS: intel,amd,broadcom,virtio VULKAN_DRIVERS: intel,amd,broadcom,virtio
.debian-cl-testing: debian-rusticl-testing:
extends: extends:
- .meson-build - .meson-build
- .ci-deqp-artifacts - .ci-deqp-artifacts
variables: variables:
BUILDTYPE: "debugoptimized"
EXTRA_OPTION: >
-D valgrind=disabled
LLVM_VERSION: 15 LLVM_VERSION: 15
UNWIND: "enabled"
DRI_LOADERS: > DRI_LOADERS: >
-D glx=disabled -D glx=disabled
-D egl=disabled -D egl=disabled
-D gbm=disabled -D gbm=disabled
GALLIUM_DRIVERS: "swrast" GALLIUM_DRIVERS: "swrast"
BUILDTYPE: "debugoptimized"
EXTRA_OPTION: >
-D valgrind=disabled
script:
- .gitlab-ci/meson/build.sh
- .gitlab-ci/prepare-artifacts.sh
debian-rusticl-testing:
extends:
- .debian-cl-testing
variables:
GALLIUM_ST: > GALLIUM_ST: >
-D gallium-rusticl=true -D gallium-rusticl=true
-D opencl-spirv=true -D opencl-spirv=true
UNWIND: "enabled"
script:
- .gitlab-ci/meson/build.sh
- .gitlab-ci/prepare-artifacts.sh
debian-build-testing: debian-build-testing:
extends: .meson-build extends: .meson-build