summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2021-04-01 16:17:32 -0700
committerMarge Bot <eric+marge@anholt.net>2021-04-13 00:40:56 +0000
commitf86e0a519d7f8af76dfabcf996f8fd32dd971de5 (patch)
tree154c4a909a13078d46aeb9e90025b3bac7ef8279 /.gitlab-ci
parentf3bd5f9590b522f492a940dc56846806087ee907 (diff)
ci: bump bare-metal kernel to bring in an a530 stability fix
and while I'm here, drop a workaround for back when we had binary snapshots of the a530 kernel without compression support. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10047>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/container/create-rootfs.sh5
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
2 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 0297ebf4474..fb09c376d48 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -95,12 +95,9 @@ wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
# Strip the image to a small minimal system without removing the debian
# toolchain.
-# xz compress firmware so it doesn't waste RAM at runtime. Except db820c's
-# GPU firmware, due to using a precompiled kernel without compression support.
+# xz compress firmware so it doesn't waste RAM at runtime on ramdisk systems
find /lib/firmware -type f -print0 | \
- grep -vz a530 | \
xargs -0r -P4 -n4 xz -T1 -C crc32
-ln -s /lib/firmware/qcom/a530* /lib/firmware/
# Copy timezone file and remove tzdata package
rm -rf /etc/localtime
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 7f93aa13678..aff94a4fdf5 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -14,7 +14,7 @@
variables:
KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
INSTALL_KERNEL_MODULES: 1
- MESA_ROOTFS_TAG: &lava-rootfs "2021-04-08-libdrm"
+ MESA_ROOTFS_TAG: &lava-rootfs "2021-04-12-kernel"
MINIO_SUFFIX: "lava"
PIGLIT_BUILD_TARGETS: "piglit_replayer"