ci/container: move kdl build section into the script itself

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32241>
This commit is contained in:
Eric Engestrom 2024-11-19 21:28:25 +01:00 committed by Marge Bot
parent 5bfd49215b
commit aba579811b
2 changed files with 4 additions and 2 deletions

View file

@ -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

View file

@ -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