diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index babdf7ae6e..75aa948aa9 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -21,10 +21,11 @@ jobs: - debian - ubuntu - fedora + - opensuse steps: - uses: actions/checkout@v2 - - uses: systemd/mkosi@v9 + - uses: systemd/mkosi@v10 - name: Install run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2 @@ -46,13 +47,13 @@ jobs: systemd-nspawn --version - name: Build ${{ matrix.distro }} - run: sudo python3 -m mkosi --password= --qemu-headless build + run: sudo python3 -m mkosi --password= --network-veth=no --qemu-headless build - name: Show ${{ matrix.distro }} image summary run: sudo python3 -m mkosi --password= --qemu-headless summary - name: Boot ${{ matrix.distro }} systemd-nspawn - run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot + run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --network-veth=no --qemu-headless boot - name: Boot ${{ matrix.distro }} QEMU - run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless qemu + run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --network-veth=no --qemu-headless qemu diff --git a/.github/workflows/test_mkosi_boot.py b/.github/workflows/test_mkosi_boot.py index 3418fd3a51..3ea769a69f 100755 --- a/.github/workflows/test_mkosi_boot.py +++ b/.github/workflows/test_mkosi_boot.py @@ -2,13 +2,15 @@ # SPDX-License-Identifier: LGPL-2.1-or-later import pexpect +import re import sys def run() -> None: p = pexpect.spawnu(" ".join(sys.argv[1:]), logfile=sys.stdout, timeout=300) - p.expect("#") + # distro-independent root prompt + p.expect(re.compile("~[^#]{0,3}#")) p.sendline("systemctl poweroff") p.expect(pexpect.EOF) diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse index b468433f34..7eb7b857ca 100644 --- a/.mkosi/mkosi.opensuse +++ b/.mkosi/mkosi.opensuse @@ -36,7 +36,7 @@ BuildPackages= pcre-devel python3 python3-lxml - python3-jinja2 + python3-Jinja2 qrencode-devel system-user-nobody systemd-sysvinit @@ -60,6 +60,7 @@ Packages= libapparmor1 libcrypt1 libcryptsetup12 + libgcrypt20 libkmod2 liblz4-1 libmount1