Use nicer syntax in two places in CI (#35455)

.github/workflows/mkosi.yml

@@ -132,6 +132,7 @@ jobs:
         run: |
           # XXX: drop after the HyperV bug that breaks secure boot KVM guests is solved
           sed -i "s/'firmware'\s*:\s*'auto'/'firmware' : 'uefi'/g" test/*/meson.build
+
           tee mkosi.local.conf <<EOF
           [Distribution]
           Distribution=${{ matrix.distro }}
@@ -186,21 +187,24 @@ jobs:
 
       - name: Configure meson
         run: |
-          meson setup build \
-              --buildtype=debugoptimized \
-              -Dintegration-tests=true \
-              -Dremote=enabled \
-              -Dopenssl=enabled \
-              -Dblkid=enabled \
-              -Dtpm2=enabled \
-              -Dlibcryptsetup=enabled \
-              -Dlibcurl=enabled \
-              -Drepart=enabled \
-              -Dfirstboot=true \
-              -Dsysusers=true \
-              -Dtmpfiles=true \
-              -Dhwdb=true \
+          OPTIONS=(
+              --buildtype=debugoptimized
+              -Dintegration-tests=true
+              -Dremote=enabled
+              -Dopenssl=enabled
+              -Dblkid=enabled
+              -Dtpm2=enabled
+              -Dlibcryptsetup=enabled
+              -Dlibcurl=enabled
+              -Drepart=enabled
+              -Dfirstboot=true
+              -Dsysusers=true
+              -Dtmpfiles=true
+              -Dhwdb=true
               -Dvmspawn=enabled
+          )
+
+          meson setup build "${OPTIONS[@]}"
 
       - name: Build image
         run: sudo meson compile -C build mkosi

test/units/TEST-64-UDEV-STORAGE.sh

@@ -177,7 +177,7 @@ testcase_nvme_basic() {
     local expected_symlinks=()
     local i
 
-    for (( i = 0; i < 5; i++ )); do
+    for i in {0..4}; do
         expected_symlinks+=(
             # both replace mode provides the same devlink
             /dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_deadbeef"$i"
@@ -185,7 +185,7 @@ testcase_nvme_basic() {
             /dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_deadbeef"$i"_1
         )
     done
-    for (( i = 5; i < 10; i++ )); do
+    for i in {5..9}; do
         expected_symlinks+=(
             # old replace mode
             /dev/disk/by-id/nvme-QEMU_NVMe_Ctrl__deadbeef_"$i"
@@ -195,7 +195,7 @@ testcase_nvme_basic() {
             /dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_____deadbeef__"$i"_1
         )
     done
-    for (( i = 10; i < 15; i++ )); do
+    for i in {10..14}; do
         expected_symlinks+=(
             # old replace mode does not provide devlink, as serial contains "/"
             # newer replace mode
@@ -204,7 +204,7 @@ testcase_nvme_basic() {
             /dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_____dead_beef_"$i"_1
         )
     done
-    for (( i = 15; i < 20; i++ )); do
+    for i in {15..19}; do
         expected_symlinks+=(
             # old replace mode does not provide devlink, as serial contains "/"
             # newer replace mode