ci: combine omitsystemd x64 and arm64 into one GitHub action

Running tests on arm64 is just as stable as x64, there is
no need to separate them. Combine them into one GitHub
action should make it easier to reason about regressions.

diff --git a/.github/workflows/daily-omitsystemd-x64.yml b/.github/workflows/daily-omitsystemd-x64.yml
deleted file mode 100644 (file)
index 3189cd2..0000000
--- a/.github/workflows/daily-omitsystemd-x64.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-name: Daily Tests - omitsystemd (x64)
-
-on:  # yamllint disable-line rule:truthy
-    schedule:
-        - cron: '30 23 * * *'   # every day at 23:30 UTC
-
-    # Allows you to run this workflow manually from the Actions tab
-    workflow_dispatch:
-
-    pull_request:
-        paths:
-            - '.github/workflows/daily-omitsystemd-x64.yml'
-
-jobs:
-    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: daily-omitsystemd-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-amd
-            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@v6
-            - name: "${{ matrix.container }} TEST-${{ matrix.test }}"
-              run: TEST_DRACUT_ARGS="--omit systemd" ./test/test-container.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}

diff --git a/.github/workflows/daily-omitsystemd-arm64.yml b/.github/workflows/daily-omitsystemd.yml
similarity index 64%
rename from .github/workflows/daily-omitsystemd-arm64.yml
rename to .github/workflows/daily-omitsystemd.yml
index 9f7b36232cc43d6514b92dbbdb804269262051d6..06e482e617dac144e7eeb09c1270b35a1168aa3d 100644 (file)
--- a/.github/workflows/daily-omitsystemd-arm64.yml
+++ b/.github/workflows/daily-omitsystemd.yml
@@ -1,5 +1,5 @@
 ---
-name: Daily Tests - omitsystemd (arm64)
+name: Daily Tests - omitsystemd
 
 on:  # yamllint disable-line rule:truthy
     schedule:
@@ -10,19 +10,22 @@ on:  # yamllint disable-line rule:truthy
 
     pull_request:
         paths:
-            - '.github/workflows/daily-omitsystemd-arm64.yml'
+            - '.github/workflows/daily-omitsystemd.yml'
 
 jobs:
     omitsystemd:
-        name: ${{ matrix.test }} on ${{ matrix.container }} with no systemd on arm64
-        runs-on: ubuntu-24.04-arm
+        name: ${{ matrix.test }} on ${{ matrix.container }} on ${{ matrix.architecture.tag }} with no systemd
+        runs-on: ${{ matrix.architecture.runner }}
         timeout-minutes: 20
         concurrency:
-            group: daily-omitsystemd-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-arm
+            group: daily-omitsystemd-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-${{ matrix.architecture.tag }}
             cancel-in-progress: true
         strategy:
             fail-fast: false
             matrix:
+                architecture:
+                    - {runner: 'ubuntu-24.04', tag: 'amd'}
+                    - {runner: 'ubuntu-24.04-arm', tag: 'arm'}
                 container:
                     - ubuntu:devel
                 test:
@@ -32,7 +35,7 @@ jobs:
                     - "26"
                     - "30"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}-arm
+            image: ghcr.io/dracut-ng/${{ matrix.container }}-${{ matrix.architecture.tag }}
             options: '--device=/dev/kvm --privileged'
         steps:
             - name: "Checkout Repository"