From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 17 Sep 2021 09:57:39 +0000 (+0100)
Subject: mkosi: Fix CI
X-Git-Tag: v250-rc1~645
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e99216c1dde13097ffda370064dd29d4dfd87cb;p=thirdparty%2Fsystemd.git

mkosi: Fix CI

\#20629 moved the mkosi configs to mkosi.default.d/ so we were building
for the host distro (Ubuntu) in each CI configuration. To fix it, we
write the distro we want to test to a mkosi.default file and mkosi
will apply the other necessary configs automatically from mkosi.default.d/<distro>

This commit also removes unnecessary CLI options that are already handled
by the config files.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 75aa948aa9d..6c601543608 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -30,8 +30,8 @@ jobs:
     - name: Install
       run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2
 
-    - name: Symlink
-      run: ln -s .mkosi/mkosi.${{ matrix.distro }} mkosi.default
+    - name: Configure
+      run: echo -e "[Distribution]\nDistribution=${{ matrix.distro }}\n" > mkosi.default
 
     # Ubuntu's systemd-nspawn doesn't support faccessat2() syscall, which is
     # required, since current Arch's glibc implements faccessat() via faccessat2().
@@ -47,13 +47,13 @@ jobs:
         systemd-nspawn --version
 
     - name: Build ${{ matrix.distro }}
-      run: sudo python3 -m mkosi --password= --network-veth=no --qemu-headless build
+      run: sudo python3 -m mkosi build
 
     - name: Show ${{ matrix.distro }} image summary
-      run: sudo python3 -m mkosi --password= --qemu-headless summary
+      run: sudo python3 -m mkosi summary
 
     - name: Boot ${{ matrix.distro }} systemd-nspawn
-      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --network-veth=no --qemu-headless boot
+      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi boot
 
     - name: Boot ${{ matrix.distro }} QEMU
-      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --network-veth=no --qemu-headless qemu
+      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi qemu