]> git.ipfire.org Git - thirdparty/dracut-ng.git/commitdiff
ci(opensuse): make mkosi-initrd installation more complete
authorJo Zzsi <jozzsicsataban@gmail.com>
Mon, 30 Dec 2024 14:55:33 +0000 (09:55 -0500)
committerLaszlo <laszlo.gombos@gmail.com>
Mon, 30 Dec 2024 15:15:31 +0000 (10:15 -0500)
Add '--privileged' flag for running systemd tests to make sure
mkosi-initrd runs well.

.github/workflows/integration.yml
test/container/Dockerfile-opensuse

index 7a0e714fcc741bde8e41a86914ab17c8d471fb51..557f4d1e1c5e4f3228d06732450e01b5f40bd510 100644 (file)
@@ -121,7 +121,7 @@ jobs:
                     - "42"
         container:
             image: ghcr.io/dracut-ng/${{ matrix.container }}
-            options: '--device=/dev/kvm'
+            options: '--device=/dev/kvm --privileged'
         steps:
             - name: "Checkout Repository"
               uses: actions/checkout@v4
index f4c6455321b6689876ad090329e0bb77c50a26e0..6c27356561df1260665c351770f1a6640fd49d5d 100644 (file)
@@ -49,7 +49,13 @@ RUN zypper --non-interactive install --no-recommends \
     tpm2.0-tools \
     /usr/bin/qemu-system-$(uname -m) \
     util-linux-systemd \
-    && zypper --non-interactive dist-upgrade --no-recommends && zypper --non-interactive clean
+    && zypper --non-interactive dist-upgrade --no-recommends
 
+# install mkosi from source
 RUN \
-  cd / && git clone https://github.com/systemd/mkosi && ln -s /mkosi/bin/mkosi /usr/bin/mkosi && ln -s /mkosi/bin/mkosi-initrd /usr/bin/mkosi-initrd
+  cd / \
+  && git clone https://github.com/systemd/mkosi \
+  && ln -s /mkosi/bin/mkosi /usr/bin/mkosi \
+  && ln -s /mkosi/bin/mkosi-initrd /usr/bin/mkosi-initrd \
+  && zypper --non-interactive remove busybox-diffutils busybox-less \
+  && /usr/bin/mkosi dependencies | xargs zypper --non-interactive install