From 05b2024c367fe8238bdc2e24dc5d2a78cfb80ca5 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 23:20:55 +0100 Subject: [PATCH] ci/container: close debian_{setup,cleanup} sections Allowing users to collapse them without hiding everything. Part-of: --- .gitlab-ci/container/debian/test-base.sh | 4 ++++ .gitlab-ci/container/debian/test-gl.sh | 4 ++++ .gitlab-ci/container/debian/test-vk.sh | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index 3615829dbeb..47697f7a463 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -126,6 +126,8 @@ pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedeskt # Needed for manipulation with traces yaml files. pip3 install --break-system-packages yq +section_end debian_setup + ############### Download prebuilt kernel if [ "$DEBIAN_ARCH" = amd64 ]; then @@ -172,3 +174,5 @@ apt-get purge -y "${EPHEMERAL[@]}" rm -rf /root/.rustup . .gitlab-ci/container/container_post_build.sh + +section_end debian_cleanup diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh index 9f5cf10b525..afdec92a14a 100644 --- a/.gitlab-ci/container/debian/test-gl.sh +++ b/.gitlab-ci/container/debian/test-gl.sh @@ -82,6 +82,8 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \ . .gitlab-ci/container/container_pre_build.sh +section_end debian_setup + ############### Build piglit PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON @@ -129,3 +131,5 @@ uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system" apt-get purge -y "${EPHEMERAL[@]}" . .gitlab-ci/container/container_post_build.sh + +section_end debian_cleanup diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh index 43318c62e60..10fb65c4b18 100644 --- a/.gitlab-ci/container/debian/test-vk.sh +++ b/.gitlab-ci/container/debian/test-vk.sh @@ -80,6 +80,8 @@ apt-get install -y --no-remove --no-install-recommends \ . .gitlab-ci/container/container_pre_build.sh +section_end debian_setup + ############### Build piglit replayer # We don't run any _piglit_ Vulkan tests in the containers. @@ -131,3 +133,5 @@ uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system" apt-get purge -y "${EPHEMERAL[@]}" . .gitlab-ci/container/container_post_build.sh + +section_end debian_cleanup