From 70f10dc3279f6bd15152ebb417152fc98fd534d8 Mon Sep 17 00:00:00 2001
From: Guilherme Gallo <guilherme.gallo@collabora.com>
Date: Wed, 2 Apr 2025 22:18:16 +0000
Subject: [PATCH] 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>
---
 .gitlab-ci/container/lava_build.sh | 5 -----
 .gitlab-ci/image-tags.yml          | 2 +-
 .gitlab-ci/lava/lava-submit.sh     | 6 ++++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 73f737ee563..d18c06a3536 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -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
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index de36d299e79..94da4c923d2 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -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"
diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index 3753ceb1a82..fbcae2a979c 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -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