From a14e91981ac21e7ebe9ab9e96891d8a8503bcf5d Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Thu, 23 May 2024 23:09:44 -0700
Subject: [PATCH] ci/piglit: be explicit about what we building

Now CI will easily fail build, when needed dependency is not present,
instead of building without it.

Shortens build for VK container, where we use only replayer.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29370>
---
 .gitlab-ci/container/debian/test-gl.sh | 16 +++++++++++++++-
 .gitlab-ci/container/debian/test-vk.sh | 19 +++++++++++++++++--
 .gitlab-ci/container/lava_build.sh     | 16 +++++++++++++++-
 .gitlab-ci/image-tags.yml              |  6 +++---
 4 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
index d5bafd3229a..a6252e1e5be 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -78,7 +78,21 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
 
 ############### Build piglit
 
-PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON -DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
+PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
+	     -DPIGLIT_USE_GBM=ON
+	     -DPIGLIT_USE_WAYLAND=ON
+	     -DPIGLIT_USE_X11=ON
+	     -DPIGLIT_BUILD_GLX_TESTS=ON
+	     -DPIGLIT_BUILD_EGL_TESTS=ON
+	     -DPIGLIT_BUILD_WGL_TESTS=OFF
+	     -DPIGLIT_BUILD_GL_TESTS=ON
+	     -DPIGLIT_BUILD_GLES1_TESTS=ON
+	     -DPIGLIT_BUILD_GLES2_TESTS=ON
+	     -DPIGLIT_BUILD_GLES3_TESTS=ON
+	     -DPIGLIT_BUILD_CL_TESTS=ON
+	     -DPIGLIT_BUILD_VK_TESTS=ON
+	     -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" \
+  . .gitlab-ci/container/build-piglit.sh
 
 ############### Build dEQP GL
 
diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh
index 0a1745de177..1bd737f7c0a 100644
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -95,8 +95,23 @@ wine \
 . .gitlab-ci/container/build-hang-detection.sh
 
 ############### Build piglit replayer
-
-PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
+# We don't run any _piglit_ Vulkan tests in the containers.
+PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
+	     -DPIGLIT_USE_GBM=OFF
+	     -DPIGLIT_USE_WAYLAND=OFF
+	     -DPIGLIT_USE_X11=OFF
+	     -DPIGLIT_BUILD_GLX_TESTS=OFF
+	     -DPIGLIT_BUILD_EGL_TESTS=OFF
+	     -DPIGLIT_BUILD_WGL_TESTS=OFF
+	     -DPIGLIT_BUILD_GL_TESTS=OFF
+	     -DPIGLIT_BUILD_GLES1_TESTS=OFF
+	     -DPIGLIT_BUILD_GLES2_TESTS=OFF
+	     -DPIGLIT_BUILD_GLES3_TESTS=OFF
+	     -DPIGLIT_BUILD_CL_TESTS=OFF
+	     -DPIGLIT_BUILD_VK_TESTS=OFF
+	     -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF" \
+  PIGLIT_BUILD_TARGETS="piglit_replayer" \
+  . .gitlab-ci/container/build-piglit.sh
 
 ############### Build Fossilize
 
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index df2278a0820..aa90383e635 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -295,7 +295,21 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]] \
 fi
 
 ############### Build piglit
-PIGLIT_OPTS="-DPIGLIT_BUILD_DMA_BUF_TESTS=ON -DPIGLIT_BUILD_GLX_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
+PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
+	     -DPIGLIT_USE_GBM=ON
+	     -DPIGLIT_USE_WAYLAND=ON
+	     -DPIGLIT_USE_X11=ON
+	     -DPIGLIT_BUILD_GLX_TESTS=ON
+	     -DPIGLIT_BUILD_EGL_TESTS=ON
+	     -DPIGLIT_BUILD_WGL_TESTS=OFF
+	     -DPIGLIT_BUILD_GL_TESTS=ON
+	     -DPIGLIT_BUILD_GLES1_TESTS=ON
+	     -DPIGLIT_BUILD_GLES2_TESTS=ON
+	     -DPIGLIT_BUILD_GLES3_TESTS=ON
+	     -DPIGLIT_BUILD_CL_TESTS=OFF
+	     -DPIGLIT_BUILD_VK_TESTS=ON
+	     -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" \
+  . .gitlab-ci/container/build-piglit.sh
 mv /piglit $ROOTFS/.
 
 ############### Build libva tests
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index fa4135eb7bc..c1011a76555 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -28,9 +28,9 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_TEST_ANDROID_TAG: "20240423-deqp"
-   DEBIAN_TEST_GL_TAG: "20240523-piglit-e1"
-   DEBIAN_TEST_VK_TAG: "20240523-piglit-e1"
-   KERNEL_ROOTFS_TAG: "20240523-piglit-e1"
+   DEBIAN_TEST_GL_TAG: "20240524-piglit-b"
+   DEBIAN_TEST_VK_TAG: "20240524-piglit-b"
+   KERNEL_ROOTFS_TAG: "20240524-piglit-b"
 
    ALPINE_X86_64_BUILD_TAG: "20240517-m0ld"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"