From 15526060cc52b747ffe083bc3866042f5b1f37c4 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 6 May 2024 15:22:46 +0200 Subject: [PATCH 1/5] mkosi: Install radvd Required for networkd integration tests. --- mkosi.images/system/mkosi.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf index 6d476d385e..f7f32a07e6 100644 --- a/mkosi.images/system/mkosi.conf +++ b/mkosi.images/system/mkosi.conf @@ -50,6 +50,7 @@ Packages= openssl python3 qrencode + radvd rsync sed socat From 2c5dc1df1d9e782e0167cf697a347296e7f34b24 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 6 May 2024 16:21:53 +0200 Subject: [PATCH 2/5] mkosi: Install python3-psutil Required to run systemd-networkd-tests.py. Already a dependency of systemd-tests on Fedora so we don't add it there as it'll be pulled in via the prepare script. --- mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf | 1 + mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 1 + mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf index cc05300e80..0a91f6e226 100644 --- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf @@ -38,6 +38,7 @@ Packages= polkit procps-ng psmisc + python-psutil quota-tools sbsigntools shadow diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf index 492872029d..c80cd2b839 100644 --- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf @@ -61,6 +61,7 @@ Packages= policykit-1 procps psmisc + python3-psutil quota sbsigntool squashfs-tools diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf index 349e00bdcd..c0c85fb9f1 100644 --- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf @@ -56,6 +56,7 @@ Packages= procps4 psmisc python3-pefile + python3-psutil quota rpm-build rsync From f3548f28b3cbdb8387ac4e5ae73b49a975d83cb5 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 6 May 2024 18:16:09 +0200 Subject: [PATCH 3/5] meson: Fix formatting --- test/TEST-21-DFUZZER/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TEST-21-DFUZZER/meson.build b/test/TEST-21-DFUZZER/meson.build index 03cae4f7da..e107b85561 100644 --- a/test/TEST-21-DFUZZER/meson.build +++ b/test/TEST-21-DFUZZER/meson.build @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -test_params = test_params + { +test_params += { 'timeout' : 3600, - 'priority': -50, + 'priority' : -50, } From 8f59b036de2fb62e4277f23388f5780db38a6165 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 6 May 2024 20:20:10 +0200 Subject: [PATCH 4/5] mkosi: Install dhcp-server on OpenSUSE Required for systemd-networkd-tests.py. --- mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf index c0c85fb9f1..10cbd21a8f 100644 --- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf @@ -31,6 +31,7 @@ Packages= cryptsetup dbus-broker device-mapper + dhcp-server docbook-xsl-stylesheets f2fs-tools gawk From 7681a8ee58052f5eae78fa5e8b2c2a481892d55d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 6 May 2024 22:22:50 +0200 Subject: [PATCH 5/5] ci: Disable RuntimeBuildSources= We build with debuginfo, so there's no point to starting virtiofsd to mount the sources and build directory into the VM, so let's disable that. --- .github/workflows/mkosi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index eed78696f3..973eb4fd7f 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -123,6 +123,8 @@ jobs: ToolsTreeDistribution=fedora # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions QemuFirmware=uefi + # We build with debuginfo so there's no point in mounting the sources into the machine. + RuntimeBuildSources=no EOF # These should override the options from mkosi.conf so we put them in a dropin that's ordered later