ci: add test coverage for omitting systemd on a systemd container

Omitting systemd on a systemd enabled environment is supported, so
let's add test coverage for this configuration.

diff --git a/.github/workflows/integration-extra.yml b/.github/workflows/integration-extra.yml
index 75e03d3db3c99f68dcc07dbb925721d226759bdf..76a81e24656371ffd238b33acd53dc8340777a42 100644 (file)
--- a/.github/workflows/integration-extra.yml
+++ b/.github/workflows/integration-extra.yml
@@ -133,3 +133,31 @@ jobs:
               uses: actions/checkout@v5
             - name: "${{ matrix.container }} TEST-${{ matrix.test }}"
               run: USE_NETWORK=${{ matrix.network }} ./test/test-container.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
+    omitsystemd:
+        # run this test on all containers
+        name: ${{ matrix.test }} on ${{ matrix.container }} with no systemd
+        runs-on: ubuntu-24.04
+        timeout-minutes: 20
+        concurrency:
+            group: omitsystemd-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}
+            cancel-in-progress: true
+        strategy:
+            fail-fast: false
+            matrix:
+                container:
+                    - arch:latest
+                test:
+                    - "10"
+                    - "11"
+                    - "12"
+                    - "20"
+                    - "26"
+                    - "30"
+        container:
+            image: ghcr.io/dracut-ng/${{ matrix.container }}-amd
+            options: '--device=/dev/kvm --privileged'
+        steps:
+            - name: "Checkout Repository"
+              uses: actions/checkout@v5
+            - name: "${{ matrix.container }} TEST-${{ matrix.test }}"
+              run: TEST_DRACUT_ARGS="--omit systemd" ./test/test-container.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}

diff --git a/test/test.sh b/test/test.sh
index c4302d323ee83f6c6beac627472c4721ee73f469..fcd6211c2b4f56c38293c31a5f6ab0132ec21914 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -49,7 +49,7 @@ fi
 # clear previous test run
 TARGETS='clean all install check' "$PODMAN" run --rm -it \
     --device=/dev/kvm --privileged \
-    -e V -e TESTS -e TEST_RUN_ID -e TARGETS -e MAKEFLAGS \
+    -e V -e TESTS -e TEST_RUN_ID -e TARGETS -e MAKEFLAGS -e TEST_DRACUT_ARGS \
     -v "$PWD"/:/z \
     "$CONTAINER" \
     /z/test/test-container.sh