Skip to content

Commit 593c996

Browse files
committed
test: enable RHEL-10 vdo tests
kmod-kvdo has been replaced in RHEL 10 with the in kernel dm-vdo module. For support it still needs the `vdo` package for `vdoformat` which lvm2 utilities call. https://issues.redhat.com/browse/RHELDOCS-19842
1 parent 6cbad38 commit 593c996

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/verify/check-storage-vdo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import testlib
2424
SIZE_10G = "10000000000"
2525

2626

27-
@testlib.skipImage("vdo not currently available in RHEL 10", "rhel-10*", "centos-10*")
2827
class TestStorageVDO(storagelib.StorageCase):
2928

3029
provision = {"0": {"memory_mb": 1800}}
@@ -34,6 +33,8 @@ class TestStorageVDO(storagelib.StorageCase):
3433
b = self.browser
3534

3635
self.login_and_go("/storage")
36+
# an empty xfs filesystem created with 6.4.0 is smaller then newer xfs versions
37+
old_xfs = m.image.startswith('rhel-9') or m.image.startswith('centos-9')
3738

3839
# Make a volume group in which to create the VDO LV
3940
dev = "/dev/" + m.add_disk(SIZE_10G, serial="DISK1")["dev"]
@@ -87,13 +88,13 @@ class TestStorageVDO(storagelib.StorageCase):
8788

8889
# compressible data should affect logical usage
8990
m.execute("dd if=/dev/zero of=/run/data/empty bs=1M count=1000")
90-
b.wait_in_text(self.card_desc("xfs filesystem", "Usage"), "1.2 / ")
91+
b.wait_in_text(self.card_desc("xfs filesystem", "Usage"), "1.2 / " if old_xfs else "1.3 / ")
9192
# but not physical usage
9293
b.wait_text(self.card_desc("LVM2 VDO pool", "Data used"), "3.86 GB (64%)")
9394

9495
# incompressible data
9596
m.execute("dd if=/dev/urandom of=/run/data/gibberish bs=1M count=1000")
96-
b.wait_in_text(self.card_desc("xfs filesystem", "Usage"), "2.2 / ")
97+
b.wait_in_text(self.card_desc("xfs filesystem", "Usage"), "2.2 / " if old_xfs else "2.3 / ")
9798
# equal amount of physical space (not completely predictable due to random data)
9899
b.wait_in_text(self.card_desc("LVM2 VDO pool", "Data used"), "4.")
99100

@@ -390,7 +391,6 @@ config: !Configuration
390391

391392

392393
@testlib.onlyImage("VDO API only supported on RHEL", "rhel-*", "centos-*")
393-
@testlib.skipImage("vdo not currently available in RHEL 10", "rhel-10*", "centos-10*")
394394
class TestStoragePackagesVDO(packagelib.PackageCase, storagelib.StorageHelpers):
395395

396396
provision = {"0": {"memory_mb": 1500}}

0 commit comments

Comments
 (0)