From aba579811bfc1f947656b8bb228653917b7fd204 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:28:25 +0100 Subject: [PATCH] ci/container: move kdl build section into the script itself Part-of: --- .gitlab-ci/container/build-kdl.sh | 4 ++++ .gitlab-ci/container/lava_build.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-kdl.sh b/.gitlab-ci/container/build-kdl.sh index dcbb202c4b3..3a034896905 100755 --- a/.gitlab-ci/container/build-kdl.sh +++ b/.gitlab-ci/container/build-kdl.sh @@ -3,6 +3,8 @@ set -ex +uncollapsed_section_start kdl "Building kdl" + KDL_REVISION="cbbe5fd54505fd03ee34f35bfd16794f0c30074f" KDL_CHECKOUT_DIR="/tmp/ci-kdl.git" @@ -26,3 +28,5 @@ popd ) rm -rf ${KDL_CHECKOUT_DIR} + +section_end kdl diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index adf6f1504be..c2f8bc818dc 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -349,10 +349,8 @@ if [[ ${DEBIAN_ARCH} = "amd64" ]]; then fi ############### Build ci-kdl -section_start kdl "Prepare a venv for kdl" . .gitlab-ci/container/build-kdl.sh mv /ci-kdl $ROOTFS/ -section_end kdl ############### Build local stuff for use by igt and kernel testing, which ############### will reuse most of our container build process from a specific