Merge pull request #32766 from DaanDeMeyer/test

Various test improvements

.github/workflows/mkosi.yml

@@ -71,7 +71,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-    - uses: systemd/mkosi@22d212dcb229b553572578ef16c809f9a9961ee8
+    - uses: systemd/mkosi@55f17a8ae67ece9712324c3107804daad94ad0d9
 
     # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
     # immediately, we remove the files in the background. However, we first move them to a different location

mkosi.conf

@@ -40,6 +40,9 @@ KernelCommandLine=systemd.crash_shell
                   panic=-1
                   softlockup_panic=1
                   panic_on_warn=1
+                  # These don't ship proper units with [Install] directives so we have to mask them instead.
+                  systemd.mask=isc-dhcp-server.service
+                  systemd.mask=mdmonitor.service
 
 [Host]
 Credentials=journal.storage=persistent

mkosi.images/minimal-0/mkosi.conf

@@ -2,6 +2,7 @@
 
 [Config]
 Dependencies=minimal-base
+ConfigureScripts=
 
 [Distribution]
 CacheOnly=always

mkosi.images/minimal-1/mkosi.conf

@@ -2,6 +2,7 @@
 
 [Config]
 Dependencies=minimal-base
+ConfigureScripts=
 
 [Distribution]
 CacheOnly=always

mkosi.images/minimal-base/mkosi.conf

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Config]
+ConfigureScripts=
+
 [Output]
 Format=directory
 

mkosi.images/system/mkosi.conf

@@ -20,7 +20,7 @@ ExtraTrees=
         %O/minimal-1.root-%a.raw:/usr/share/minimal_1.raw
         %O/minimal-1.root-%a-verity.raw:/usr/share/minimal_1.verity
         %O/minimal-1.root-%a-verity-sig.raw:/usr/share/minimal_1.verity.sig
-        %O/minimal-base:/usr/share/testsuite-13-container-template
+        %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template
 
 Packages=
         acl
@@ -42,7 +42,9 @@ Packages=
         kmod
         knot
         less
+        lvm2
         man
+        mdadm
         mtools
         nano
         nftables

mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf

@@ -30,6 +30,8 @@ Packages=
         iputils
         linux
         man-db
+        multipath-tools
+        open-iscsi
         openbsd-netcat
         openssh
         openssl
@@ -44,6 +46,7 @@ Packages=
         shadow
         squashfs-tools
         stress
+        tgt
         tpm2-tools
         tpm2-tss
         vim

mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf

@@ -24,6 +24,8 @@ Packages=
         bind-utils
         bpftool
         cryptsetup
+        device-mapper-event
+        device-mapper-multipath
         dfuzzer
         dhcp-server
         dnf
@@ -35,7 +37,9 @@ Packages=
         iproute
         iproute-tc
         iputils
+        iscsi-initiator-utils
         kernel-core
+        kernel-modules # For squashfs and megasas2
         libasan
         libcap-ng-utils
         libubsan

mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf

@@ -9,4 +9,3 @@ RepartDirectories=mkosi.repart
 [Content]
 Packages=
         rpmautospec-rpm-macros
-        kernel-modules # For squashfs

mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf

@@ -54,7 +54,9 @@ Packages=
         libtss2-tcti-device0
         locales
         man-db
+        multipath-tools
         netcat-openbsd
+        open-iscsi
         openssh-client
         openssh-server
         passwd
@@ -66,6 +68,7 @@ Packages=
         sbsigntool
         squashfs-tools
         stress
+        tgt
         tpm2-tools
         tzdata
         xxd

mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf

@@ -2,3 +2,7 @@
 
 [Match]
 Distribution=debian
+
+[Content]
+Packages=
+        linux-image-generic

mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf

@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Architecture=x86-64
-
-[Content]
-Packages=
-        linux-image-cloud-amd64

mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf

@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Architecture=arm64
-
-[Content]
-Packages=
-        linux-image-cloud-arm64

mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf

@@ -7,8 +7,9 @@ Distribution=fedora
 Packages=
         btrfs-progs
         compsize
-        f2fs-tools
         dnf5
+        f2fs-tools
+        scsi-target-utils
 
 InitrdPackages=
         btrfs-progs

mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf

@@ -50,6 +50,8 @@ Packages=
         libasan8
         libkmod2
         libubsan1
+        multipath-tools
+        open-iscsi
         openssh-clients
         openssh-server
         pam
@@ -65,6 +67,7 @@ Packages=
         sed
         shadow
         squashfs
+        tgt
         timezone
         tpm2.0-tools
         user(bin)

mkosi.images/system/mkosi.extra/.autorelabel

@@ -0,0 +1 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later

mkosi.images/system/mkosi.extra/etc/iscsi/iscsid.conf

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+iscsid.startup = /usr/bin/systemctl start iscsid.socket

mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset

@@ -31,3 +31,6 @@ disable auditd.service
 
 # systemd-timesyncd is not enabled by default in the default systemd preset so enable it here instead.
 enable systemd-timesyncd.service
+
+# Skipped if selinux is not enabled, required for TEST-06-SELINUX.
+enable autorelabel.service

test/TEST-01-BASIC/meson.build

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+integration_tests += [
+        integration_test_template + {
+                'name' : 'TEST-01-BASIC',
+        },
+]