system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-01 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Ignore configure scripts in minimal images

Browse source 
These are always aimed at the system image so ignore any specified
configure scripts in the minimal images.
This commit is contained in:
Daan De Meyer 2024-05-12 15:16:37 +02:00
parent 31c797e03d
commit eb4c962aa4
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mkosi.images/minimal-0/mkosi.conf
View file

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

1
mkosi.images/minimal-1/mkosi.conf
View file

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

3
mkosi.images/minimal-base/mkosi.conf
View file

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

2
test/integration-test-wrapper.py
View file

@ -122,6 +122,7 @@ def main():
f"systemd.unit-dropin.{args.unit}={shlex.quote(dropin)}", f"systemd.unit-dropin.{args.unit}={shlex.quote(dropin)}",
'--runtime-network=none', '--runtime-network=none',
'--runtime-scratch=no', '--runtime-scratch=no',
*args.mkosi_args,
'--append', '--append',
'--qemu-firmware', args.firmware, '--qemu-firmware', args.firmware,
'--kernel-command-line-extra', '--kernel-command-line-extra',
@ -142,7 +143,6 @@ def main():
), ),
]), ]),
'--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}", '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
*args.mkosi_args,
'qemu', 'qemu',
] ]