fixup! WIP: test: Run integration tests with mkosi-built image

mkosi.images/system/mkosi.conf

@@ -15,6 +15,7 @@ Dependencies=
         testsuite-13-container-template
         testsuite-55-oomd
         testsuite-58-repart
+        testsuite-69-shutdown
 
 [Output]
 @Format=directory
@@ -54,6 +55,7 @@ ExtraTrees=
         %O/testsuite-13-container-template.raw:/usr/share/testsuite-13-container-template.raw
         %O/testsuite-55-oomd.raw:/usr/share/testsuite-55-oomd.raw
         %O/testsuite-58-repart.raw:/usr/share/testsuite-58-repart.raw
+        %O/testsuite-69-shutdown.raw:/usr/share/testsuite-69-shutdown.raw
 
 Packages=
         acl
@@ -83,6 +85,7 @@ Packages=
         nvme-cli
         openssl
         qrencode
+        screen
         scsi-target-utils
         sed
         socat

mkosi.images/testsuite-69-shutdown/mkosi.conf

@@ -0,0 +1,9 @@
+[Config]
+Dependencies=base
+
+[Output]
+Format=sysext
+Overlay=yes
+
+[Content]
+BaseTrees=%O/base

mkosi.images/testsuite-69-shutdown/mkosi.extra/usr/lib/extension-release.d/extension-release.testsuite-69-shutdown

@@ -0,0 +1 @@
+EXTENSION_RELOAD_MANAGER=1

mkosi.images/testsuite-69-shutdown/mkosi.extra/usr/lib/systemd/system.conf.d/99-timeout.conf

@@ -0,0 +1,3 @@
+[Manager]
+DefaultTimeoutStopSec=30s
+DefaultTimeoutAbortSec=30s

mkosi.images/testsuite-69-shutdown/mkosi.extra/usr/lib/systemd/system/systemd-firstboot.service.d/no-root-password.conf

@@ -0,0 +1,2 @@
+[Service]
+ExecStart=systemd-firstboot --prompt-locale --prompt-timezone --delete-root-password

mkosi.images/testsuite-69-shutdown/mkosi.extra/usr/lib/tmpfiles.d/99-bashrc.conf

@@ -0,0 +1,2 @@
+C /root/.bashrc
+C /root/.profile

mkosi.images/testsuite-69-shutdown/mkosi.extra/usr/share/factory/mkosi/etc/screenrc

@@ -0,0 +1,2 @@
+startup_message off
+bell_msg ""

mkosi.images/testsuite-69-shutdown/mkosi.finalize

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+mkdir -p "$BUILDROOT/usr/share/factory/root"
+if [[ -e "$BUILDROOT/root/.bashrc" ]]; then
+    cp -a "$BUILDROOT/root/.bashrc" "$BUILDROOT/usr/share/factory/root/.bashrc"
+fi
+if [[ -e "$BUILDROOT/root/.profile" ]]; then
+    cp -a "$BUILDROOT/root/.profile" "$BUILDROOT/usr/share/factory/root/.profile"
+fi
+echo "PS1='screen\$WINDOW # '" >>"$BUILDROOT/usr/share/factory/root/.bashrc"
+echo "PS1='\s-\v\\\$ '" >>"$BUILDROOT/usr/share/factory/root/.profile"

test/TEST-69-SHUTDOWN/hook.py

@@ -0,0 +1,23 @@
+#!/usr/bin/python3
+
+from logging import getLogger as logging_get_logger
+from pathlib import Path
+from shlex import quote
+from shutil import which
+from subprocess import run
+
+
+log = logging_get_logger(__name__)
+
+
+def wrap_run(args, **kwargs):
+    args[0] = which(args[0])
+    clargs = [Path(__file__).parents[1] / 'test-shutdown.py', '-v', '--']
+    clargs += args
+    log.debug(f"Running {' '.join(quote(str(a)) for a in clargs)}")
+    run(clargs, **kwargs)
+
+
+def check_result(mountpoint, console_log):
+    # This test determines success by whether the wrapper command failed
+    pass

test/TEST-69-SHUTDOWN/meson.build

@@ -0,0 +1,15 @@
+test_params += {
+        'mkosi_args' : [
+                '--kernel-command-line-extra',
+                ' '.join([
+                        'apparmor=0',
+                        'selinux=0',
+                        'enforcing=0',
+                        f'SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/testsuite-@test_number@.units:/usr/lib/systemd/tests/testdata/units:',
+                        'systemd.unit=testsuite.target',
+                        f'systemd.wants=@test_unit_name@',
+                        'systemd.mount-extra=/usr/share/testsuite-69-shutdown.raw:/run/extensions/testsuite-69-shutdown.raw::bind',
+                ]),
+        ],
+        'hook_module' : meson.current_source_dir() / 'hook.py',
+}

test/integration_test_wrapper.py

@@ -165,7 +165,7 @@ def main():
                       f"{per_test_output_dir.absolute()}")
             rename(td, per_test_output_dir)
 
-        def run_mkosi(mkosi_args, **kwargs):
+        def run_mkosi(mkosi_args, run=run, **kwargs):
             clargs = [
                 'mkosi',
                 '--directory=..',
@@ -199,7 +199,10 @@ def run_mkosi(mkosi_args, **kwargs):
             stack.enter_context(hook.setup(mkosi_args, qemu_opts))
 
         run_mkosi(mkosi_args + ['qemu'] + qemu_opts,
-                  check=True, stderr=STDOUT, stdout=console_log)
+                  check=True, stderr=STDOUT, stdout=console_log,
+                  **({'run': hook.wrap_run}
+                     if hook is not None and hasattr(hook, 'wrap_run')
+                     else {}))
         console_log.seek(0)
         copyfileobj(console_log, stdout.buffer)
 

test/meson.build

@@ -385,7 +385,7 @@ if get_option('integration-tests') != false
                 '66': 'TEST-66-DEVICE-ISOLATION',
                 '67': 'TEST-67-INTEGRITY',
                 '68': 'TEST-68-PROPAGATE-EXIT-STATUS',
-                #'69': 'TEST-69-SHUTDOWN', # customises image and removes end.service from kernel cmdline
+                '69': 'TEST-69-SHUTDOWN',
                 #'70': 'TEST-70-TPM2', # tpm2 permission problems
                 '71': 'TEST-71-HOSTNAME',
                 '72': 'TEST-72-SYSUPDATE',