From 596cfbbed1a6a632c04c0c9b5b5f125352ad2d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Tue, 4 Feb 2025 14:15:14 +0200 Subject: [PATCH] ci/debian/test-vk: trim down the container on a per-arch basis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not every architectures has jobs requiring every features provided by the VK test container, so let's trim it down a bit by disabling the features that are not needed. Signed-off-by: Martin Roukala (né Peres) Part-of: --- .gitlab-ci/container/debian/test-vk.sh | 47 ++++++++++++++------------ 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh index 6925f0713eb..e8638b86db0 100644 --- a/.gitlab-ci/container/debian/test-vk.sh +++ b/.gitlab-ci/container/debian/test-vk.sh @@ -79,23 +79,25 @@ section_end debian_setup ############### Build piglit replayer -# 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" \ +if [ "$DEBIAN_ARCH" != "armhf" ]; then + # 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 +fi ############### Build dEQP VK @@ -103,9 +105,11 @@ DEQP_API=tools \ DEQP_TARGET=default \ . .gitlab-ci/container/build-deqp.sh -DEQP_API=VK-main \ -DEQP_TARGET=default \ -. .gitlab-ci/container/build-deqp.sh +if [ "$DEBIAN_ARCH" == "amd64" ]; then + DEQP_API=VK-main \ + DEQP_TARGET=default \ + . .gitlab-ci/container/build-deqp.sh +fi DEQP_API=VK \ DEQP_TARGET=default \ @@ -115,9 +119,10 @@ rm -rf /VK-GL-CTS ############### Build Fossilize -uncollapsed_section_switch fossilize "Building Fossilize" - -. .gitlab-ci/container/build-fossilize.sh +if [ "$DEBIAN_ARCH" != "armhf" ]; then + uncollapsed_section_switch fossilize "Building Fossilize" + . .gitlab-ci/container/build-fossilize.sh +fi ############### Build gfxreconstruct