diff --git a/.gitlab-ci/container/download-prebuilt-kernel.sh b/.gitlab-ci/container/download-prebuilt-kernel.sh deleted file mode 100644 index 50c0156949b..00000000000 --- a/.gitlab-ci/container/download-prebuilt-kernel.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -# shellcheck disable=SC2086 # we want word splitting -# shellcheck disable=SC2153 - -set -uex - -mkdir -p kernel -pushd kernel - -if [[ ${DEBIAN_ARCH} = "arm64" ]]; then - KERNEL_IMAGE_NAME+=" cheza-kernel" -fi - -for image in ${KERNEL_IMAGE_NAME:-}; do - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - -o "/lava-files/${image}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${image}" -done - -for dtb in ${DEVICE_TREES:-}; do - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - -o "/lava-files/${dtb}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${dtb}" - done - -mkdir -p "/lava-files/rootfs-${DEBIAN_ARCH}" -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 "/lava-files/rootfs-${DEBIAN_ARCH}/" - -popd -rm -rf kernel - diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index f1ce93675fc..8fb4a743727 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -58,34 +58,12 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then BUILD_VK="ON" GCC_ARCH="aarch64-linux-gnu" KERNEL_ARCH="arm64" - DEFCONFIG="arch/arm64/configs/defconfig" - DEVICE_TREES="rk3399-gru-kevin.dtb" - DEVICE_TREES+=" meson-g12b-a311d-khadas-vim3.dtb" - DEVICE_TREES+=" meson-gxl-s805x-libretech-ac.dtb" - DEVICE_TREES+=" meson-gxm-khadas-vim2.dtb" - DEVICE_TREES+=" sun50i-h6-pine-h64.dtb" - DEVICE_TREES+=" imx8mq-nitrogen.dtb" - DEVICE_TREES+=" mt8192-asurada-spherion-r0.dtb" - DEVICE_TREES+=" mt8183-kukui-jacuzzi-juniper-sku16.dtb" - DEVICE_TREES+=" tegra210-p3450-0000.dtb" - DEVICE_TREES+=" apq8016-sbc-usb-host.dtb" - DEVICE_TREES+=" apq8096-db820c.dtb" - DEVICE_TREES+=" sc7180-trogdor-lazor-limozeen-nots-r5.dtb" - DEVICE_TREES+=" sc7180-trogdor-kingoftown.dtb" - DEVICE_TREES+=" sm8350-hdk.dtb" - KERNEL_IMAGE_NAME="Image" elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then BUILD_CL="OFF" BUILD_VK="OFF" GCC_ARCH="arm-linux-gnueabihf" KERNEL_ARCH="arm" - DEFCONFIG="arch/arm/configs/multi_v7_defconfig" - DEVICE_TREES="rk3288-veyron-jaq.dtb" - DEVICE_TREES+=" sun8i-h3-libretech-all-h3-cc.dtb" - DEVICE_TREES+=" imx6q-cubox-i.dtb" - DEVICE_TREES+=" tegra124-jetson-tk1.dtb" - KERNEL_IMAGE_NAME="zImage" . .gitlab-ci/container/create-cross-file.sh armhf CONTAINER_ARCH_PACKAGES=( libegl1-mesa-dev:armhf @@ -105,9 +83,6 @@ else BUILD_VK="ON" GCC_ARCH="x86_64-linux-gnu" KERNEL_ARCH="x86_64" - DEFCONFIG="arch/x86/configs/x86_64_defconfig" - DEVICE_TREES="" - KERNEL_IMAGE_NAME="bzImage" CONTAINER_ARCH_PACKAGES=( libasound2-dev libcap-dev libfdt-dev libva-dev p7zip wine ) @@ -407,9 +382,10 @@ if [[ -e ".gitlab-ci/local/build-rootfs.sh" ]]; then . .gitlab-ci/local/build-rootfs.sh fi - -############### Download prebuilt kernel -. .gitlab-ci/container/download-prebuilt-kernel.sh +############### 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 @@ -435,9 +411,6 @@ cp /etc/wgetrc $ROOTFS/etc/. if [ "${DEBIAN_ARCH}" = "arm64" ]; then mkdir -p /lava-files/rootfs-arm64/lib/firmware/qcom/sm8350/ # for firmware imported later - # Make a gzipped copy of the Image for db410c. - gzip -k /lava-files/Image - KERNEL_IMAGE_NAME+=" Image.gz" fi ROOTFSTAR="lava-rootfs.tar.zst" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index a4f3fe05f0a..f8e97ba45c9 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -33,7 +33,7 @@ variables: DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle" DEBIAN_TEST_GL_TAG: "20250221-piglit-04" DEBIAN_TEST_VK_TAG: "20250221-piglit-04" - KERNEL_ROOTFS_TAG: "20250221-piglit-04" + KERNEL_ROOTFS_TAG: "20250221-rm-kernel" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20250129-lavacli"