test: Ignore configure scripts in minimal images

These are always aimed at the system image so ignore any specified
configure scripts in the minimal images.

diff --git a/mkosi.images/minimal-0/mkosi.conf b/mkosi.images/minimal-0/mkosi.conf
index 3315d4b4a9c5799959bded5471967234b8451699..a929fb6eea35cfd8bd33c97083ba1e9c0884b986 100644 (file)
--- a/mkosi.images/minimal-0/mkosi.conf
+++ b/mkosi.images/minimal-0/mkosi.conf
@@ -2,6 +2,7 @@
 
 [Config]
 Dependencies=minimal-base
+ConfigureScripts=
 
 [Distribution]
 CacheOnly=always

diff --git a/mkosi.images/minimal-1/mkosi.conf b/mkosi.images/minimal-1/mkosi.conf
index 3315d4b4a9c5799959bded5471967234b8451699..a929fb6eea35cfd8bd33c97083ba1e9c0884b986 100644 (file)
--- a/mkosi.images/minimal-1/mkosi.conf
+++ b/mkosi.images/minimal-1/mkosi.conf
@@ -2,6 +2,7 @@
 
 [Config]
 Dependencies=minimal-base
+ConfigureScripts=
 
 [Distribution]
 CacheOnly=always

diff --git a/mkosi.images/minimal-base/mkosi.conf b/mkosi.images/minimal-base/mkosi.conf
index 477db6150f225b898cee3496bfeefe6e2bc568ef..7eb147379fe35184c6a7a51e471c1cf8c790f2e2 100644 (file)
--- a/mkosi.images/minimal-base/mkosi.conf
+++ b/mkosi.images/minimal-base/mkosi.conf
@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Config]
+ConfigureScripts=
+
 [Output]
 Format=directory
 

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 14afc0f9c5f144a2d6107feb4092950edb9955bc..55ea4ff0d8f637e38646da8dc6f82c9575592cf9 100755 (executable)
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -122,6 +122,7 @@ def main():
         f"systemd.unit-dropin.{args.unit}={shlex.quote(dropin)}",
         '--runtime-network=none',
         '--runtime-scratch=no',
+        *args.mkosi_args,
         '--append',
         '--qemu-firmware', args.firmware,
         '--kernel-command-line-extra',
@@ -142,7 +143,6 @@ def main():
             ),
         ]),
         '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
-        *args.mkosi_args,
         'qemu',
     ]