ci/container: add weston into Vulkan container

Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24056>

diff --git a/.gitlab-ci/container/debian/x86_64_test-vk.sh b/.gitlab-ci/container/debian/x86_64_test-vk.sh
index 3113a6323569f1ec5f3341dec0a38e25dcfb17f5..0a8b45e6a4a65cf8fea75640f53646804d8c4eae 100644 (file)
--- a/.gitlab-ci/container/debian/x86_64_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-vk.sh
@@ -63,6 +63,8 @@ apt-get install -y --no-remove --no-install-recommends \
       python3-lxml \
       python3-simplejson \
       sysvinit-core \
+      weston \
+      xwayland \
       xinit \
       xserver-xorg-video-amdgpu \
       xserver-xorg-video-ati

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index e5a46e6a6d7d0ba827b63c9e96853b7f3dc9e72d..a7fc7c3c13784113c2fd8fe6b9ef5cc1499beffb 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -16,7 +16,7 @@ variables:
 
    DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-06-07-deqp"
    DEBIAN_X86_64_TEST_GL_TAG: "2023-07-02-apitrace-lto"
-   DEBIAN_X86_64_TEST_VK_TAG: "2023-07-02-apitrace-lto"
+   DEBIAN_X86_64_TEST_VK_TAG: "2023-07-08-weston-0"
 
    ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
    ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"