From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 13 May 2024 17:08:42 +0000 (+0200)
Subject: TEST-64-UDEV-STORAGE: Skip LVM subtests on Ubuntu
X-Git-Tag: v256-rc2~18^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c6afa6c0dacd086605b53a79c9b53a43988803;p=thirdparty%2Fsystemd.git

TEST-64-UDEV-STORAGE: Skip LVM subtests on Ubuntu

These fail for unknown reasons on Ubuntu. Until someone from Ubuntu
who cares can figure out why, let's skip these tests on Ubuntu.
---

diff --git a/test/units/TEST-64-UDEV-STORAGE.sh b/test/units/TEST-64-UDEV-STORAGE.sh
index fe40c2eed88..3450813dff6 100755
--- a/test/units/TEST-64-UDEV-STORAGE.sh
+++ b/test/units/TEST-64-UDEV-STORAGE.sh
@@ -545,6 +545,12 @@ testcase_lvm_basic() {
         /dev/disk/by-id/scsi-0systemd_foobar_deadbeeflvm{0..3}
     )
 
+    . /etc/os-release
+    if [[ "$ID" == "ubuntu" ]]; then
+        echo "LVM on Ubuntu is broken, skipping the test" | tee --append /skipped
+        exit 77
+    fi
+
     if [[ -v ASAN_OPTIONS || "$(systemd-detect-virt -v)" == "qemu" ]]; then
         timeout=180
     else
@@ -853,6 +859,12 @@ testcase_iscsi_lvm() {
         /dev/disk/by-id/scsi-0systemd_foobar_deadbeefiscsi{0..3}
     )
 
+    . /etc/os-release
+    if [[ "$ID" == "ubuntu" ]]; then
+        echo "LVM on Ubuntu is broken, skipping the test" | tee --append /skipped
+        exit 77
+    fi
+
     ls -l "${devices[@]}"
 
     # Start the target daemon (debian names it tgt.service so make sure we handle that)