ci: Add the Vulkan validation layer to amd64 rootfs builds.

We're going to want this for zink testing on actual HW drivers.  I haven't
sorted out the arm64 build yet, so no tu coverage.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22459>

diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index f50badb..68c7acf 100755 (executable)
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -163,6 +163,13 @@ rm -rf /apitrace-msvc-win64
 STRIP_CMD="${GCC_ARCH}-strip"
 mkdir -p $ROOTFS/usr/lib/$GCC_ARCH
 
+############### Build Vulkan validation layer (for zink)
+if [ "$DEBIAN_ARCH" = "amd64" ]; then
+  . .gitlab-ci/container/build-vulkan-validation.sh
+  mv /usr/lib/x86_64-linux-gnu/libVkLayer_khronos_validation.so $ROOTFS/usr/lib/x86_64-linux-gnu/
+  mkdir -p $ROOTFS/usr/share/vulkan/explicit_layer.d
+  mv /usr/share/vulkan/explicit_layer.d/* $ROOTFS/usr/share/vulkan/explicit_layer.d/
+fi
 
 ############### Build apitrace
 . .gitlab-ci/container/build-apitrace.sh

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 9a49e9f..186487d 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -21,7 +21,7 @@ variables:
 
    ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
    FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng"
-   KERNEL_ROOTFS_TAG: "2023-04-21-deqp-vkcts"
+   KERNEL_ROOTFS_TAG: "2023-04-24-vulkan-validation"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"