diff --git a/tests/kola/root-reprovision/luks/data/luks-test.sh b/tests/kola/root-reprovision/luks/data/luks-test.sh index 615b4fd175..9b64020c3c 100755 --- a/tests/kola/root-reprovision/luks/data/luks-test.sh +++ b/tests/kola/root-reprovision/luks/data/luks-test.sh @@ -29,12 +29,20 @@ if ! grep -q no_read_workqueue <<< "${table}"; then fi ok "discard and custom option enabled for root LUKS" -# while we're here, sanity-check that boot is mounted by UUID -if ! systemctl cat boot.mount | grep -q What=/dev/disk/by-uuid; then - systemctl cat boot.mount - fatal "boot mounted not by UUID" +# while we're here, sanity-check that boot is mounted by UUID or dm-mpath-boot +if grep -q "rd.multipath=default" /proc/cmdline; then + if ! systemctl cat boot.mount | grep -q "What=/dev/disk/by-label/dm-mpath-boot"; then + systemctl cat boot.mount + fatal "boot is not mounted by /dev/disk/by-label/dm-mpath-boot" + fi + ok "boot mounted from /dev/disk/by-label/dm-mpath-boot" +else + if ! systemctl cat boot.mount | grep -q "What=/dev/disk/by-uuid"; then + systemctl cat boot.mount + fatal "boot is not mounted by UUID as expected" + fi + ok "boot mounted by UUID" fi -ok "boot mounted by UUID" case "${AUTOPKGTEST_REBOOT_MARK:-}" in "") diff --git a/tests/kola/root-reprovision/luks/multipath/config.ign b/tests/kola/root-reprovision/luks/multipath/config.ign new file mode 120000 index 0000000000..f72ce41f73 --- /dev/null +++ b/tests/kola/root-reprovision/luks/multipath/config.ign @@ -0,0 +1 @@ +../config.ign \ No newline at end of file diff --git a/tests/kola/root-reprovision/luks/multipath/data b/tests/kola/root-reprovision/luks/multipath/data new file mode 120000 index 0000000000..4909e06efb --- /dev/null +++ b/tests/kola/root-reprovision/luks/multipath/data @@ -0,0 +1 @@ +../data \ No newline at end of file diff --git a/tests/kola/root-reprovision/luks/multipath/test.sh b/tests/kola/root-reprovision/luks/multipath/test.sh new file mode 100755 index 0000000000..9436679480 --- /dev/null +++ b/tests/kola/root-reprovision/luks/multipath/test.sh @@ -0,0 +1,24 @@ +#!/bin/bash +## kola: +## # This test reprovisions the rootfs. +## tags: "reprovision" +## # This uses additionalDisks, which is QEMU only +## platforms: qemu +## # Root reprovisioning requires at least 4GiB of memory. +## minMemory: 4096 +## # A TPM backend device is not available on s390x to suport TPM. +## architectures: "! s390x" +## # This test includes a lot of disk I/O and needs a higher +## # timeout value than the default. +## timeoutMin: 15 +## description: Verify that LUKS on a mpath disks works. +## primaryDisk: ":mpath" +## appendKernelArgs: "rd.multipath=default" + +set -xeuo pipefail + +# shellcheck disable=SC1091 +. "$KOLA_EXT_DATA/commonlib.sh" + +# run the rest of the tests +. $KOLA_EXT_DATA/luks-test.sh