diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-03-29 10:42:23 +0200 |
---|---|---|
committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-03-29 13:27:19 +0200 |
commit | 94c9855a1823be6b0a2342ba5a8b57353fa32ea3 (patch) | |
tree | 7dd666c20a9694f7a19606b581caa21c659a8a14 /test | |
parent | 3ceb96e018f63eb9b51b720d065cd0e94dc303cc (diff) | |
download | systemd-94c9855a1823be6b0a2342ba5a8b57353fa32ea3.tar.gz |
mkosi: Update to latest
- Drop Netdev= as it was removed in mkosi
- Always install python-psutil in the final image (required for networkd tests)
- Always Install python-pytest in the final image (required for ukify tests)
- Use the narrow glob for all centos python packages
- Drop the networkd mkosi config files (the default image can be used instead)
- Use ".conf" as the mkosi config file suffix everywhere
- Copy src/ to /root/src in the final image and set gdb substitute path in
.gdbinit to make gdb work properly
Diffstat (limited to 'test')
-rwxr-xr-x | test/mkosi.build.networkd-test | 25 | ||||
-rw-r--r-- | test/mkosi.default.networkd-test | 82 | ||||
-rw-r--r-- | test/mkosi.nspawn.networkd-test | 4 |
3 files changed, 0 insertions, 111 deletions
diff --git a/test/mkosi.build.networkd-test b/test/mkosi.build.networkd-test deleted file mode 100755 index 25c935ed61..0000000000 --- a/test/mkosi.build.networkd-test +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: LGPL-2.1-or-later -set -ex - -# First, source in the main build script -. "$SRCDIR"/mkosi.build - -mkdir -p "$DESTDIR"/usr/local/bin -cp "$SRCDIR"/test/networkd-test.py "$DESTDIR"/usr/local/bin/networkd-test.py - -mkdir -p "$DESTDIR"/etc/systemd/system -cat >"$DESTDIR"/etc/systemd/system/networkd-test.service <<EOF -[Unit] -Description=networkd test service -SuccessAction=exit -FailureAction=exit - -[Service] -ExecStart=/usr/local/bin/networkd-test.py -EOF - -mkdir -p "$DESTDIR"/etc/systemd/system/multi-user.target.wants/ -ln -s ../networkd-test.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/ - -systemctl --root="$DESTDIR" disable systemd-networkd.service diff --git a/test/mkosi.default.networkd-test b/test/mkosi.default.networkd-test deleted file mode 100644 index fe15f394be..0000000000 --- a/test/mkosi.default.networkd-test +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# -# Puts together an nspawn container and runs networkd-test.py in it, inside a -# network namespace and everything. Run this with -# -# mkosi -C test --default=mkosi.default.networkd-test boot -# -# This will start the test and eventually exit with success in case the test -# succeeded. - -[Distribution] -Distribution=fedora -Release=33 - -[Output] -Format=raw_btrfs -Bootable=yes -OutputDirectory=../mkosi.output -Output=networkd-test.raw - -[Partitions] -RootSize=3G - -[Content] -BuildPackages= - audit-libs-devel - bzip2-devel - cryptsetup-devel - dbus-devel - diffutils - docbook-style-xsl - elfutils-devel - gcc - gettext - git - gnutls-devel - gperf - hostname - iptables-devel - kmod-devel - libacl-devel - libblkid-devel - libcap-devel - libcurl-devel - libgcrypt-devel - libidn2-devel - libmicrohttpd-devel - libmount-devel - libseccomp-devel - libselinux-devel - libxkbcommon-devel - libxslt - lz4 - lz4-devel - meson - ninja-build - pam-devel - pcre2-devel - perl(IPC::SysV) - perl(Time::HiRes) - pkgconfig - python3-devel - python3-lxml - qrencode-devel - tree - -Packages= - dnsmasq - iproute - libidn2 - polkit - python3 - -# Share caches with the top-level mkosi -BuildDirectory=../mkosi/mkosi.builddir -Cache=../mkosi/mkosi.cache - -# Run our own script -BuildScript=mkosi.build.networkd-test - -BuildSources=.. -NSpawnSettings=mkosi.nspawn.networkd-test diff --git a/test/mkosi.nspawn.networkd-test b/test/mkosi.nspawn.networkd-test deleted file mode 100644 index f624f241f3..0000000000 --- a/test/mkosi.nspawn.networkd-test +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Network] -Private=yes |