From 08ea0076641a40bb24e8e3975671f41b9ecda6fa Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Sun, 4 Apr 2021 12:30:16 +0200 Subject: [PATCH] ci: disable initrd support For baremetal CI we are using a 'dummy' rootfs as it is required by abootimg. This causes NFS boot problems when using u-boot as bootloader. [ 13.230968] RAMDISK: gzip image found at block 0 [ 13.235645] using deprecated initrd support, will be removed in 2021. [ 13.243106] List of all partitions: If we disable CONFIG_BLK_DEV_INITRD nfsroot works. Signed-off-by: Christian Gmeiner Reviewed-by: Tomeu Vizoso Reviewed-by: Eric Anholt Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/arm.config | 3 +++ .gitlab-ci/container/arm64.config | 3 +++ .gitlab-ci/container/x86_64.config | 3 +++ .gitlab-ci/lava-gitlab-ci.yml | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a06f01bf89a..decaeb4ab02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -450,7 +450,7 @@ kernel+rootfs_arm64-baremetal: variables: DEBIAN_ARCH: "arm64" KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-04-01-5.11.tar.gz" - MESA_ROOTFS_TAG: &arm-baremetal "2021-04-14-librenderdoc" + MESA_ROOTFS_TAG: &arm-baremetal "2021-04-15-nfsroot" MINIO_SUFFIX: "baremetal" # Kernel & rootfs for armhf baremetal testing diff --git a/.gitlab-ci/container/arm.config b/.gitlab-ci/container/arm.config index 02c0087dff7..eecd1e3182a 100644 --- a/.gitlab-ci/container/arm.config +++ b/.gitlab-ci/container/arm.config @@ -2,6 +2,9 @@ CONFIG_LOCALVERSION="ccu" CONFIG_DEBUG_KERNEL=y +# abootimg with a 'dummy' rootfs fails with root=/dev/nfs +CONFIG_BLK_DEV_INITRD=n + CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config index 11e96174e94..919275a7aa6 100644 --- a/.gitlab-ci/container/arm64.config +++ b/.gitlab-ci/container/arm64.config @@ -2,6 +2,9 @@ CONFIG_LOCALVERSION="ccu" CONFIG_DEBUG_KERNEL=y +# abootimg with a 'dummy' rootfs fails with root=/dev/nfs +CONFIG_BLK_DEV_INITRD=n + CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y diff --git a/.gitlab-ci/container/x86_64.config b/.gitlab-ci/container/x86_64.config index 283ecc75dd0..049f4e13e82 100644 --- a/.gitlab-ci/container/x86_64.config +++ b/.gitlab-ci/container/x86_64.config @@ -2,6 +2,9 @@ CONFIG_LOCALVERSION="ccu" CONFIG_DEBUG_KERNEL=y +# abootimg with a 'dummy' rootfs fails with root=/dev/nfs +CONFIG_BLK_DEV_INITRD=n + CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 9e537831ceb..d4c77cf4609 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-14-librenderdoc" + MESA_ROOTFS_TAG: &lava-rootfs "2021-04-15-nfsroot" MINIO_SUFFIX: "lava" PIGLIT_BUILD_TARGETS: "piglit_replayer"