[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: ignore builtin modules

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40955?usp=email ) Change subject: testenv: qemu: ignore builtin modules ...................................................................... testenv: qemu: ignore builtin modules In debian 13, the virtio_pci kernel module is now builtin. Adjust the code paths that add kernel modules to the initramfs and load them to ignore builtin modules. This fixes the ttcn3-ggsn-test-kernel-latest job job, which currently fails with: + modprobe -a --dry-run --show-depends --set-version=6.12.41+deb13-amd64 virtio_net virtio_pci + sort -u + cut -d -f 2 + local files=virtio_pci /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/net_failover.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/virtio_net.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/net/core/failover.ko.xz + qemu_initrd_add_file virtio_pci /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/net_failover.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/drivers/net/virtio_net.ko.xz /lib/modules/6.12.41+deb13-amd64/kernel/net/core/failover.ko.xz /usr/lib/modules/6.12.41+deb13-amd64/modules.alias + local i + local cp=cp --no-dereference --recursive --parents + cp --no-dereference --recursive --parents virtio_pci <https://jenkins.osmocom.org/jenkins/job/ttcn3-ggsn-test-kernel-latest/1665/artifact/logs/osmo_ggsn_v4_only/ggsn/_initrd> cp: cannot stat 'virtio_pci': No such file or directory Change-Id: Ied8acf18d0a1f47fac805619d15896918a365ff2 --- M _testenv/data/scripts/qemu/qemu_functions.sh M _testenv/data/scripts/qemu/qemu_init.sh 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/data/scripts/qemu/qemu_functions.sh b/_testenv/data/scripts/qemu/qemu_functions.sh index c1ef8b8..e8aad5d 100755 --- a/_testenv/data/scripts/qemu/qemu_functions.sh +++ b/_testenv/data/scripts/qemu/qemu_functions.sh @@ -38,6 +38,7 @@ --show-depends \ --set-version="$kernel" \ "$@" \ + | grep -v '^builtin ' \ | sort -u \ | cut -d ' ' -f 2)" diff --git a/_testenv/data/scripts/qemu/qemu_init.sh b/_testenv/data/scripts/qemu/qemu_init.sh index 1c100f8..4981e49 100755 --- a/_testenv/data/scripts/qemu/qemu_init.sh +++ b/_testenv/data/scripts/qemu/qemu_init.sh @@ -22,7 +22,7 @@ # Load modules from qemu_initrd_add_mod() if [ -e /modules ]; then - cat /modules | xargs -t -n1 modprobe + cat /modules | xargs -t -n1 modprobe || true fi ip link set lo up -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40955?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied8acf18d0a1f47fac805619d15896918a365ff2 Gerrit-Change-Number: 40955 Gerrit-PatchSet: 1 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt;