mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-06 11:38:05 +02:00
ci/lava: Fetch kernel modules from overlay
LAVA supports overlays in the deploy action, so there is no need to download them in lava_build.sh and bloat the rootfs file with it. Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34352>
This commit is contained in:
parent
2a7c38b48e
commit
70f10dc327
3 changed files with 7 additions and 6 deletions
|
|
@ -382,11 +382,6 @@ if [[ -e ".gitlab-ci/local/build-rootfs.sh" ]]; then
|
|||
. .gitlab-ci/local/build-rootfs.sh
|
||||
fi
|
||||
|
||||
############### Download kernel modules
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-O "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst"
|
||||
tar --keep-directory-symlink --zstd -xf modules.tar.zst -C "$ROOTFS/"
|
||||
|
||||
############### Delete rust, since the tests won't be compiling anything.
|
||||
rm -rf /root/.cargo
|
||||
rm -rf /root/.rustup
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ variables:
|
|||
DEBIAN_TEST_ANDROID_TAG: "20250330-angle-1b"
|
||||
DEBIAN_TEST_GL_TAG: "20250330-angle-1b"
|
||||
DEBIAN_TEST_VK_TAG: "20250327-apitrace"
|
||||
KERNEL_ROOTFS_TAG: "20250330-angle-1b"
|
||||
KERNEL_ROOTFS_TAG: "20250402-overlay"
|
||||
|
||||
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
|
||||
DEBIAN_PYUTILS_TAG: "20250321-s3cp-fix5"
|
||||
|
|
|
|||
|
|
@ -100,5 +100,11 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
|
|||
--compression=gz \
|
||||
--path="/" \
|
||||
--format=tar \
|
||||
- append-overlay \
|
||||
--name=extra-modules \
|
||||
--url="${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst" \
|
||||
--compression=zstd \
|
||||
--path="/" \
|
||||
--format=tar \
|
||||
- submit \
|
||||
>> results/lava.log
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue