In the next commit, we'll start building Zink in the meson-testing step,
and because mega-drivers end up stuffing all dependencies in the same
shared-object, we end up requiring libvulkan for other drivers as well.
So let's no longer track separately who needs vulkan and who doesn't,
and just always install it.
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8879>
extends:
- .use-arm_test-base
variables:
- MESA_IMAGE_TAG: &arm64_test "2021-02-08-container-reorg"
+ MESA_IMAGE_TAG: &arm64_test "2021-02-10-zink"
.use-arm64_test:
extends:
extends:
- .use-arm_test-base
variables:
- MESA_IMAGE_TAG: &armhf_test "2021-02-08-container-reorg"
+ MESA_IMAGE_TAG: &armhf_test "2021-02-10-zink"
.use-armhf_test:
extends:
############### Create rootfs
KERNEL_URL=https://github.com/anholt/linux/archive/mesa-ci-2021-01-27-5.11rc5.tar.gz
-DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh
+DEBIAN_ARCH=$arch . .gitlab-ci/container/lava_build.sh
############### Uninstall the build software
"
fi
-if [ -n "$INCLUDE_VK_CTS" ]; then
- VK_CTS_PACKAGES="libvulkan1"
-fi
-
if [ -n "$INCLUDE_PIGLIT" ]; then
PIGLIT_PACKAGES="libwaffle-1-0
libxkbcommon0
libpng16-16 \
libpython3.7 \
libsensors5 \
+ libvulkan1 \
libwaffle-1-0 \
libx11-6 \
libx11-xcb1 \
variables:
- MESA_LAVA_TAG: "2021-02-08-subdir-move"
+ MESA_LAVA_TAG: "2021-02-10-zink"
.kernel+rootfs:
stage: container-2