Merge ~chad.smith/curtin:vmtest-jammy-and-lunar into curtin:master

[Chad Smith]

vmtests: add Jammy and Lunar and drop Hirsute and Impish

Update vmtests to run against newer supported releases.

Drop interim releases no longer actively supported: Hirsute/Impish
Add latest LTS jammy and latest interim lunar.

Note vmtests will break on Jammy/Lunar as there are no 'smello' pkg uploads queued in the ppa:curtin-dev/test-archive.
We need to upload something to that PPA to unblock some vmtest failures.

[ 89.772130] cloud-init[918]: E: The repository 'https://ppa.launchpadcontent.net/curtin-dev/test-archive/ubuntu jammy Release' does not have a Release file.

Steps to generate this PR:
./tools/vmtest-remove-release hirsute
./tools/vmtest-remove-release impish
./tools/vmtest-add-release --distro-release jammy after focal
./tools/vmtest-add-release --distro-release lunar after jammy

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:5e7ab4b5727353fc6d4c890fee7dabbe0acebdc1
https://jenkins.canonical.com/server-team/job/curtin-ci/131/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/131/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/131/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/131/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/131/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/131//rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:265f6209c8d4cab2671b6a23f1469a76526f5651
https://jenkins.canonical.com/server-team/job/curtin-ci/132/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/132/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/132/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/132/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/132/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/132//rebuild

review: Approve (continuous-integration)

[Dan Bungert (dbungert)]

Thanks Chad. This should have been merged a while ago.
I have cherry-picked commits from this to https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/451677 so I think this one can be closed.

Unmerged commits

265f620... by Chad Smith on 2023-05-26

vmtests: add lunar after jammy

b180ccd... by Chad Smith on 2023-05-26

vmtests: add jammy after focal

7c7c29b... by Chad Smith on 2023-05-26

vmtests: add jammy after focal

5acd262... by Chad Smith on 2023-05-26

vmtests: remove hirsute

48e5bc4... by Chad Smith on 2023-05-26

vmtests: remove impish

diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index 67248bf..f63cd15 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -165,18 +165,18 @@ class _FocalBase(_UbuntuBase):
         subarch = "ga-20.04"
 
 
-class _HirsuteBase(_UbuntuBase):
-    release = "hirsute"
-    target_release = "hirsute"
+class _JammyBase(_UbuntuBase):
+    release = "jammy"
+    target_release = "jammy"
     if _UbuntuBase.arch == "arm64":
-        subarch = "ga-21.04"
+        subarch = "ga-22.04"
 
 
-class _ImpishBase(_UbuntuBase):
-    release = "impish"
-    target_release = "impish"
+class _LunarBase(_UbuntuBase):
+    release = "lunar"
+    target_release = "lunar"
     if _UbuntuBase.arch == "arm64":
-        subarch = "ga-21.10"
+        subarch = "ga-23.04"
 
 
 class _Releases(object):
@@ -197,8 +197,8 @@ class _Releases(object):
     disco = _DiscoBase
     eoan = _EoanBase
     focal = _FocalBase
-    hirsute = _HirsuteBase
-    impish = _ImpishBase
+    jammy = _JammyBase
+    lunar = _LunarBase
 
 
 class _CentosReleases(object):
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index 2fdd971..dc4b250 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -68,11 +68,11 @@ class FocalTestAptConfigCMDCMD(relbase.focal, TestAptConfigCMD):
     __test__ = True
 
 
-class HirsuteTestAptConfigCMDCMD(relbase.hirsute, TestAptConfigCMD):
+class JammyTestAptConfigCMDCMD(relbase.jammy, TestAptConfigCMD):
     __test__ = True
 
 
-class ImpishTestAptConfigCMDCMD(relbase.impish, TestAptConfigCMD):
+class LunarTestAptConfigCMDCMD(relbase.lunar, TestAptConfigCMD):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 616d635..8c05e65 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -234,11 +234,11 @@ class FocalTestBasic(relbase.focal, TestBasicAbs):
     __test__ = True
 
 
-class HirsuteTestBasic(relbase.hirsute, TestBasicAbs):
+class JammyTestBasic(relbase.jammy, TestBasicAbs):
     __test__ = True
 
 
-class ImpishTestBasic(relbase.impish, TestBasicAbs):
+class LunarTestBasic(relbase.lunar, TestBasicAbs):
     __test__ = True
 
 
@@ -358,11 +358,11 @@ class FocalTestScsiBasic(relbase.focal, TestBasicScsiAbs):
     __test__ = True
 
 
-class HirsuteTestScsiBasic(relbase.hirsute, TestBasicScsiAbs):
+class JammyTestScsiBasic(relbase.jammy, TestBasicScsiAbs):
     __test__ = True
 
 
-class ImpishTestScsiBasic(relbase.impish, TestBasicScsiAbs):
+class LunarTestScsiBasic(relbase.lunar, TestBasicScsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
index 0aa35fd..ba15ff2 100644
--- a/tests/vmtests/test_basic_dasd.py
+++ b/tests/vmtests/test_basic_dasd.py
@@ -56,11 +56,11 @@ class FocalTestBasicDasd(relbase.focal, TestBasicDasd):
     __test__ = True
 
 
-class HirsuteTestBasicDasd(relbase.hirsute, TestBasicDasd):
+class JammyTestBasicDasd(relbase.jammy, TestBasicDasd):
     __test__ = True
 
 
-class ImpishTestBasicDasd(relbase.impish, TestBasicDasd):
+class LunarTestBasicDasd(relbase.lunar, TestBasicDasd):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
index 490ae4c..16a3eac 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -68,11 +68,11 @@ class FocalBcacheBasic(relbase.focal, TestBcacheBasic):
     __test__ = True
 
 
-class HirsuteBcacheBasic(relbase.hirsute, TestBcacheBasic):
+class JammyBcacheBasic(relbase.jammy, TestBcacheBasic):
     __test__ = True
 
 
-class ImpishBcacheBasic(relbase.impish, TestBcacheBasic):
+class LunarBcacheBasic(relbase.lunar, TestBcacheBasic):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
index 3b19c41..d781267 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -23,11 +23,11 @@ class FocalTestBcacheBug1718699(relbase.focal, TestBcacheBug1718699):
     __test__ = True
 
 
-class HirsuteTestBcacheBug1718699(relbase.hirsute, TestBcacheBug1718699):
+class JammyTestBcacheBug1718699(relbase.jammy, TestBcacheBug1718699):
     __test__ = True
 
 
-class ImpishTestBcacheBug1718699(relbase.impish, TestBcacheBug1718699):
+class LunarTestBcacheBug1718699(relbase.lunar, TestBcacheBug1718699):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
index 713ade9..da1c579 100644
--- a/tests/vmtests/test_bcache_ceph.py
+++ b/tests/vmtests/test_bcache_ceph.py
@@ -79,11 +79,11 @@ class FocalTestBcacheCeph(relbase.focal, TestBcacheCeph):
     __test__ = True
 
 
-class HirsuteTestBcacheCeph(relbase.hirsute, TestBcacheCeph):
+class JammyTestBcacheCeph(relbase.jammy, TestBcacheCeph):
     __test__ = True
 
 
-class ImpishTestBcacheCeph(relbase.impish, TestBcacheCeph):
+class LunarTestBcacheCeph(relbase.lunar, TestBcacheCeph):
     __test__ = True
 
 
@@ -113,11 +113,11 @@ class FocalTestBcacheCephLvm(relbase.focal, TestBcacheCephLvm):
     __test__ = True
 
 
-class HirsuteTestBcacheCephLvm(relbase.hirsute, TestBcacheCephLvm):
+class JammyTestBcacheCephLvm(relbase.jammy, TestBcacheCephLvm):
     __test__ = True
 
 
-class ImpishTestBcacheCephLvm(relbase.impish, TestBcacheCephLvm):
+class LunarTestBcacheCephLvm(relbase.lunar, TestBcacheCephLvm):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
index 6268fd5..41b4933 100644
--- a/tests/vmtests/test_bcache_partitions.py
+++ b/tests/vmtests/test_bcache_partitions.py
@@ -29,11 +29,11 @@ class FocalTestBcachePartitions(relbase.focal, TestBcachePartitions):
     __test__ = True
 
 
-class HirsuteTestBcachePartitions(relbase.hirsute, TestBcachePartitions):
+class JammyTestBcachePartitions(relbase.jammy, TestBcachePartitions):
     __test__ = True
 
 
-class ImpishTestBcachePartitions(relbase.impish, TestBcachePartitions):
+class LunarTestBcachePartitions(relbase.lunar, TestBcachePartitions):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
index 7d70f9c..180aa86 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -243,11 +243,11 @@ class FocalTestFsBattery(relbase.focal, TestFsBattery):
     __test__ = True
 
 
-class HirsuteTestFsBattery(relbase.hirsute, TestFsBattery):
+class JammyTestFsBattery(relbase.jammy, TestFsBattery):
     __test__ = True
 
 
-class ImpishTestFsBattery(relbase.impish, TestFsBattery):
+class LunarTestFsBattery(relbase.lunar, TestFsBattery):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index 2fd9866..8d54af2 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -76,11 +76,11 @@ class FocalTestIscsiBasic(relbase.focal, TestBasicIscsiAbs):
     __test__ = True
 
 
-class HirsuteTestIscsiBasic(relbase.hirsute, TestBasicIscsiAbs):
+class JammyTestIscsiBasic(relbase.jammy, TestBasicIscsiAbs):
     __test__ = True
 
 
-class ImpishTestIscsiBasic(relbase.impish, TestBasicIscsiAbs):
+class LunarTestIscsiBasic(relbase.lunar, TestBasicIscsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
index 064d71a..05f3a7b 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -36,11 +36,11 @@ class FocalTestJournaldReporter(relbase.focal, TestJournaldReporter):
     __test__ = True
 
 
-class HirsuteTestJournaldReporter(relbase.hirsute, TestJournaldReporter):
+class JammyTestJournaldReporter(relbase.jammy, TestJournaldReporter):
     __test__ = True
 
 
-class ImpishTestJournaldReporter(relbase.impish, TestJournaldReporter):
+class LunarTestJournaldReporter(relbase.lunar, TestJournaldReporter):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index a0ce90d..58f3096 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -81,11 +81,11 @@ class FocalTestLvm(relbase.focal, TestLvmAbs):
     __test__ = True
 
 
-class HirsuteTestLvm(relbase.hirsute, TestLvmAbs):
+class JammyTestLvm(relbase.jammy, TestLvmAbs):
     __test__ = True
 
 
-class ImpishTestLvm(relbase.impish, TestLvmAbs):
+class LunarTestLvm(relbase.lunar, TestLvmAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
index 463d863..33ab254 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -99,11 +99,11 @@ class FocalTestIscsiLvm(relbase.focal, TestLvmIscsiAbs):
     __test__ = True
 
 
-class HirsuteTestIscsiLvm(relbase.hirsute, TestLvmIscsiAbs):
+class JammyTestIscsiLvm(relbase.jammy, TestLvmIscsiAbs):
     __test__ = True
 
 
-class ImpishTestIscsiLvm(relbase.impish, TestLvmIscsiAbs):
+class LunarTestIscsiLvm(relbase.lunar, TestLvmIscsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
index 650fc25..9ee3a51 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -59,9 +59,12 @@ class FocalTestLvmOverRaid(relbase.focal, TestLvmOverRaidAbs):
     __test__ = True
 
 
-class HirsuteTestLvmOverRaid(relbase.hirsute, TestLvmOverRaidAbs):
+class JammyTestLvmOverRaid(relbase.jammy, TestLvmOverRaidAbs):
     __test__ = True
 
 
-class ImpishTestLvmOverRaid(relbase.impish, TestLvmOverRaidAbs):
+class LunarTestLvmOverRaid(relbase.lunar, TestLvmOverRaidAbs):
     __test__ = True
+
+
+# vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
index bc09e8d..cb1ae03 100644
--- a/tests/vmtests/test_lvm_root.py
+++ b/tests/vmtests/test_lvm_root.py
@@ -94,14 +94,14 @@ class FocalTestLvmRootExt4(relbase.focal, TestLvmRootAbs):
     }
 
 
-class HirsuteTestLvmRootExt4(relbase.hirsute, TestLvmRootAbs):
+class JammyTestLvmRootExt4(relbase.jammy, TestLvmRootAbs):
     __test__ = True
     conf_replace = {
         '__ROOTFS_FORMAT__': 'ext4',
     }
 
 
-class ImpishTestLvmRootExt4(relbase.impish, TestLvmRootAbs):
+class LunarTestLvmRootExt4(relbase.lunar, TestLvmRootAbs):
     __test__ = True
     conf_replace = {
         '__ROOTFS_FORMAT__': 'ext4',
@@ -154,7 +154,7 @@ class FocalTestUefiLvmRootExt4(relbase.focal, TestUefiLvmRootAbs):
     }
 
 
-class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs):
+class JammyTestUefiLvmRootExt4(relbase.jammy, TestUefiLvmRootAbs):
     __test__ = True
     conf_replace = {
         '__BOOTFS_FORMAT__': 'ext4',
@@ -162,7 +162,7 @@ class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs):
     }
 
 
-class ImpishTestUefiLvmRootExt4(relbase.impish, TestUefiLvmRootAbs):
+class LunarTestUefiLvmRootExt4(relbase.lunar, TestUefiLvmRootAbs):
     __test__ = True
     conf_replace = {
         '__BOOTFS_FORMAT__': 'ext4',
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index d90f478..322366d 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -158,11 +158,11 @@ class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class HirsuteTestMdadmBcache(relbase.hirsute, TestMdadmBcacheAbs):
+class JammyTestMdadmBcache(relbase.jammy, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class ImpishTestMdadmBcache(relbase.impish, TestMdadmBcacheAbs):
+class LunarTestMdadmBcache(relbase.lunar, TestMdadmBcacheAbs):
     __test__ = True
 
 
@@ -207,11 +207,11 @@ class FocalTestMirrorboot(relbase.focal, TestMirrorbootAbs):
     __test__ = True
 
 
-class HirsuteTestMirrorboot(relbase.hirsute, TestMirrorbootAbs):
+class JammyTestMirrorboot(relbase.jammy, TestMirrorbootAbs):
     __test__ = True
 
 
-class ImpishTestMirrorboot(relbase.impish, TestMirrorbootAbs):
+class LunarTestMirrorboot(relbase.lunar, TestMirrorbootAbs):
     __test__ = True
 
 
@@ -260,13 +260,13 @@ class FocalTestMirrorbootPartitions(relbase.focal,
     __test__ = True
 
 
-class HirsuteTestMirrorbootPartitions(relbase.hirsute,
-                                      TestMirrorbootPartitionsAbs):
+class JammyTestMirrorbootPartitions(relbase.jammy,
+                                    TestMirrorbootPartitionsAbs):
     __test__ = True
 
 
-class ImpishTestMirrorbootPartitions(relbase.impish,
-                                     TestMirrorbootPartitionsAbs):
+class LunarTestMirrorbootPartitions(relbase.lunar,
+                                    TestMirrorbootPartitionsAbs):
     __test__ = True
 
 
@@ -360,13 +360,13 @@ class FocalTestMirrorbootPartitionsUEFI(relbase.focal,
     __test__ = True
 
 
-class HirsuteTestMirrorbootPartitionsUEFI(relbase.hirsute,
-                                          TestMirrorbootPartitionsUEFIAbs):
+class JammyTestMirrorbootPartitionsUEFI(relbase.jammy,
+                                        TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
 
 
-class ImpishTestMirrorbootPartitionsUEFI(relbase.impish,
-                                         TestMirrorbootPartitionsUEFIAbs):
+class LunarTestMirrorbootPartitionsUEFI(relbase.lunar,
+                                        TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
 
 
@@ -414,11 +414,11 @@ class FocalTestRaid5boot(relbase.focal, TestRaid5bootAbs):
     __test__ = True
 
 
-class HirsuteTestRaid5boot(relbase.hirsute, TestRaid5bootAbs):
+class JammyTestRaid5boot(relbase.jammy, TestRaid5bootAbs):
     __test__ = True
 
 
-class ImpishTestRaid5boot(relbase.impish, TestRaid5bootAbs):
+class LunarTestRaid5boot(relbase.lunar, TestRaid5bootAbs):
     __test__ = True
 
 
@@ -479,11 +479,11 @@ class FocalTestRaid6boot(relbase.focal, TestRaid6bootAbs):
     __test__ = True
 
 
-class HirsuteTestRaid6boot(relbase.hirsute, TestRaid6bootAbs):
+class JammyTestRaid6boot(relbase.jammy, TestRaid6bootAbs):
     __test__ = True
 
 
-class ImpishTestRaid6boot(relbase.impish, TestRaid6bootAbs):
+class LunarTestRaid6boot(relbase.lunar, TestRaid6bootAbs):
     __test__ = True
 
 
@@ -530,11 +530,11 @@ class FocalTestRaid10boot(relbase.focal, TestRaid10bootAbs):
     __test__ = True
 
 
-class HirsuteTestRaid10boot(relbase.hirsute, TestRaid10bootAbs):
+class JammyTestRaid10boot(relbase.jammy, TestRaid10bootAbs):
     __test__ = True
 
 
-class ImpishTestRaid10boot(relbase.impish, TestRaid10bootAbs):
+class LunarTestRaid10boot(relbase.lunar, TestRaid10bootAbs):
     __test__ = True
 
 
@@ -638,11 +638,11 @@ class FocalTestAllindata(relbase.focal, TestAllindataAbs):
     __test__ = True
 
 
-class HirsuteTestAllindata(relbase.hirsute, TestAllindataAbs):
+class JammyTestAllindata(relbase.jammy, TestAllindataAbs):
     __test__ = True
 
 
-class ImpishTestAllindata(relbase.impish, TestAllindataAbs):
+class LunarTestAllindata(relbase.lunar, TestAllindataAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
index f6f0b22..e6d222b 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -54,11 +54,11 @@ class FocalTestIscsiMdadm(relbase.focal, TestMdadmIscsiAbs):
     __test__ = True
 
 
-class HirsuteTestIscsiMdadm(relbase.hirsute, TestMdadmIscsiAbs):
+class JammyTestIscsiMdadm(relbase.jammy, TestMdadmIscsiAbs):
     __test__ = True
 
 
-class ImpishTestIscsiMdadm(relbase.impish, TestMdadmIscsiAbs):
+class LunarTestIscsiMdadm(relbase.lunar, TestMdadmIscsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index ac85a58..71f3d06 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -162,11 +162,11 @@ class FocalTestMultipathBasic(relbase.focal, TestMultipathBasicAbs):
     __test__ = True
 
 
-class HirsuteTestMultipathBasic(relbase.hirsute, TestMultipathBasicAbs):
+class JammyTestMultipathBasic(relbase.jammy, TestMultipathBasicAbs):
     __test__ = True
 
 
-class ImpishTestMultipathBasic(relbase.impish, TestMultipathBasicAbs):
+class LunarTestMultipathBasic(relbase.lunar, TestMultipathBasicAbs):
     __test__ = True
 
 
@@ -178,11 +178,11 @@ class FocalTestMultipathReuse(relbase.focal, TestMultipathReuseAbs):
     __test__ = True
 
 
-class HirsuteTestMultipathReuse(relbase.hirsute, TestMultipathReuseAbs):
+class JammyTestMultipathReuse(relbase.jammy, TestMultipathReuseAbs):
     __test__ = True
 
 
-class ImpishTestMultipathReuse(relbase.impish, TestMultipathReuseAbs):
+class LunarTestMultipathReuse(relbase.lunar, TestMultipathReuseAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py
index 97d797e..deadbde 100644
--- a/tests/vmtests/test_multipath_lvm.py
+++ b/tests/vmtests/test_multipath_lvm.py
@@ -60,11 +60,11 @@ class FocalTestMultipathLvm(relbase.focal, TestMultipathLvmAbs):
     __test__ = True
 
 
-class HirsuteTestMultipathLvm(relbase.hirsute, TestMultipathLvmAbs):
+class JammyTestMultipathLvm(relbase.jammy, TestMultipathLvmAbs):
     __test__ = True
 
 
-class ImpishTestMultipathLvm(relbase.impish, TestMultipathLvmAbs):
+class LunarTestMultipathLvm(relbase.lunar, TestMultipathLvmAbs):
     __test__ = True
 
 
@@ -77,13 +77,13 @@ class FocalTestMultipathLvmPartWipe(relbase.focal,
     __test__ = True
 
 
-class HirsuteTestMultipathLvmPartWipe(relbase.hirsute,
-                                      TestMultipathLvmPartWipeAbs):
+class JammyTestMultipathLvmPartWipe(relbase.jammy,
+                                    TestMultipathLvmPartWipeAbs):
     __test__ = True
 
 
-class ImpishTestMultipathLvmPartWipe(relbase.impish,
-                                     TestMultipathLvmPartWipeAbs):
+class LunarTestMultipathLvmPartWipe(relbase.lunar,
+                                    TestMultipathLvmPartWipeAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index 6ff3a16..1797b7b 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -478,11 +478,11 @@ class FocalTestNetworkBasic(relbase.focal, TestNetworkBasicAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkBasic(relbase.hirsute, TestNetworkBasicAbs):
+class JammyTestNetworkBasic(relbase.jammy, TestNetworkBasicAbs):
     __test__ = True
 
 
-class ImpishTestNetworkBasic(relbase.impish, TestNetworkBasicAbs):
+class LunarTestNetworkBasic(relbase.lunar, TestNetworkBasicAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index dd6ba02..2fbc91e 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -51,11 +51,11 @@ class FocalTestNetworkAlias(relbase.focal, TestNetworkAliasAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkAlias(relbase.hirsute, TestNetworkAliasAbs):
+class JammyTestNetworkAlias(relbase.jammy, TestNetworkAliasAbs):
     __test__ = True
 
 
-class ImpishTestNetworkAlias(relbase.impish, TestNetworkAliasAbs):
+class LunarTestNetworkAlias(relbase.lunar, TestNetworkAliasAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
index ad0c1d4..da33953 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -61,11 +61,11 @@ class FocalTestBonding(relbase.focal, TestNetworkBondingAbs):
     __test__ = True
 
 
-class HirsuteTestBonding(relbase.hirsute, TestNetworkBondingAbs):
+class JammyTestBonding(relbase.jammy, TestNetworkBondingAbs):
     __test__ = True
 
 
-class ImpishTestBonding(relbase.impish, TestNetworkBondingAbs):
+class LunarTestBonding(relbase.lunar, TestNetworkBondingAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index 9c90702..22adce7 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -233,11 +233,11 @@ class FocalTestBridging(relbase.focal, TestBridgeNetworkAbs):
     __test__ = True
 
 
-class HirsuteTestBridging(relbase.hirsute, TestBridgeNetworkAbs):
+class JammyTestBridging(relbase.jammy, TestBridgeNetworkAbs):
     __test__ = True
 
 
-class ImpishTestBridging(relbase.impish, TestBridgeNetworkAbs):
+class LunarTestBridging(relbase.lunar, TestBridgeNetworkAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py
index d56ebde..ea0f276 100644
--- a/tests/vmtests/test_network_disabled.py
+++ b/tests/vmtests/test_network_disabled.py
@@ -63,37 +63,35 @@ class FocalCurtinDisableNetworkRendering(relbase.focal, TestKlass1):
     __test__ = True
 
 
-class HirsuteCurtinDisableNetworkRendering(relbase.hirsute, TestKlass1):
+class FocalCurtinDisableCloudInitNetworking(relbase.focal, TestKlass2):
     __test__ = True
 
 
-class ImpishCurtinDisableNetworkRendering(relbase.impish, TestKlass1):
+class FocalCurtinDisableCloudInitNetworkingVersion1(relbase.focal, TestKlass3):
     __test__ = True
 
 
-class FocalCurtinDisableCloudInitNetworking(relbase.focal, TestKlass2):
+class JammyCurtinDisableNetworkRendering(relbase.jammy, TestKlass1):
     __test__ = True
 
 
-class HirsuteCurtinDisableCloudInitNetworking(relbase.hirsute, TestKlass2):
+class JammyCurtinDisableCloudInitNetworking(relbase.jammy, TestKlass2):
     __test__ = True
 
 
-class ImpishCurtinDisableCloudInitNetworking(relbase.impish, TestKlass2):
+class JammyCurtinDisableCloudInitNetworkingVersion1(relbase.jammy, TestKlass3):
     __test__ = True
 
 
-class FocalCurtinDisableCloudInitNetworkingVersion1(relbase.focal, TestKlass3):
+class LunarCurtinDisableNetworkRendering(relbase.lunar, TestKlass1):
     __test__ = True
 
 
-class HirsuteCurtinDisableCloudInitNetworkingVersion1(relbase.hirsute,
-                                                      TestKlass3):
+class LunarCurtinDisableCloudInitNetworking(relbase.lunar, TestKlass2):
     __test__ = True
 
 
-class ImpishCurtinDisableCloudInitNetworkingVersion1(relbase.impish,
-                                                     TestKlass3):
+class LunarCurtinDisableCloudInitNetworkingVersion1(relbase.lunar, TestKlass3):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index f524e82..022059b 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -57,11 +57,11 @@ class FocalTestNetworkIPV6(relbase.focal, TestNetworkIPV6Abs):
     __test__ = True
 
 
-class HirsuteTestNetworkIPV6(relbase.hirsute, TestNetworkIPV6Abs):
+class JammyTestNetworkIPV6(relbase.jammy, TestNetworkIPV6Abs):
     __test__ = True
 
 
-class ImpishTestNetworkIPV6(relbase.impish, TestNetworkIPV6Abs):
+class LunarTestNetworkIPV6(relbase.lunar, TestNetworkIPV6Abs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index cb9caad..64eaba5 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -27,11 +27,11 @@ class FocalTestNetworkIPV6Static(relbase.focal, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkIPV6Static(relbase.hirsute, TestNetworkIPV6StaticAbs):
+class JammyTestNetworkIPV6Static(relbase.jammy, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
-class ImpishTestNetworkIPV6Static(relbase.impish, TestNetworkIPV6StaticAbs):
+class LunarTestNetworkIPV6Static(relbase.lunar, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 7955101..cc9fb11 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -26,11 +26,11 @@ class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkIPV6Vlan(relbase.hirsute, TestNetworkIPV6VlanAbs):
+class JammyTestNetworkIPV6Vlan(relbase.jammy, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
-class ImpishTestNetworkIPV6Vlan(relbase.impish, TestNetworkIPV6VlanAbs):
+class LunarTestNetworkIPV6Vlan(relbase.lunar, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index f112b1c..ca390ef 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -193,11 +193,11 @@ class FocalTestNetworkMtu(relbase.focal, TestNetworkMtuNetworkdAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkMtu(relbase.hirsute, TestNetworkMtuNetworkdAbs):
+class JammyTestNetworkMtu(relbase.jammy, TestNetworkMtuNetworkdAbs):
     __test__ = True
 
 
-class ImpishTestNetworkMtu(relbase.impish, TestNetworkMtuNetworkdAbs):
+class LunarTestNetworkMtu(relbase.lunar, TestNetworkMtuNetworkdAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py
index 3e8699d..87836bc 100644
--- a/tests/vmtests/test_network_ovs.py
+++ b/tests/vmtests/test_network_ovs.py
@@ -38,11 +38,11 @@ class FocalTestNetworkOvs(relbase.focal, TestNetworkOvsAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkOvs(relbase.hirsute, TestNetworkOvsAbs):
+class JammyTestNetworkOvs(relbase.jammy, TestNetworkOvsAbs):
     __test__ = True
 
 
-class ImpishTestNetworkOvs(relbase.impish, TestNetworkOvsAbs):
+class LunarTestNetworkOvs(relbase.lunar, TestNetworkOvsAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index 867cf11..9dd664f 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -32,11 +32,11 @@ class FocalTestNetworkStatic(relbase.focal, TestNetworkStaticAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkStatic(relbase.hirsute, TestNetworkStaticAbs):
+class JammyTestNetworkStatic(relbase.jammy, TestNetworkStaticAbs):
     __test__ = True
 
 
-class ImpishTestNetworkStatic(relbase.impish, TestNetworkStaticAbs):
+class LunarTestNetworkStatic(relbase.lunar, TestNetworkStaticAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index 664c035..6ee8a93 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -33,13 +33,13 @@ class FocalTestNetworkStaticRoutes(relbase.focal,
     __test__ = True
 
 
-class HirsuteTestNetworkStaticRoutes(relbase.hirsute,
-                                     TestNetworkStaticRoutesAbs):
+class JammyTestNetworkStaticRoutes(relbase.jammy,
+                                   TestNetworkStaticRoutesAbs):
     __test__ = True
 
 
-class ImpishTestNetworkStaticRoutes(relbase.impish,
-                                    TestNetworkStaticRoutesAbs):
+class LunarTestNetworkStaticRoutes(relbase.lunar,
+                                   TestNetworkStaticRoutesAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 99bad66..77b2906 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -80,11 +80,11 @@ class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
     __test__ = True
 
 
-class HirsuteTestNetworkVlan(relbase.hirsute, TestNetworkVlanAbs):
+class JammyTestNetworkVlan(relbase.jammy, TestNetworkVlanAbs):
     __test__ = True
 
 
-class ImpishTestNetworkVlan(relbase.impish, TestNetworkVlanAbs):
+class LunarTestNetworkVlan(relbase.lunar, TestNetworkVlanAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index 6352f6d..79232e8 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -79,12 +79,16 @@ class FocalTestNvme(relbase.focal, TestNvmeAbs):
     # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
 
 
-class HirsuteTestNvme(relbase.hirsute, TestNvmeAbs):
+class JammyTestNvme(relbase.jammy, TestNvmeAbs):
     __test__ = False
+    # An error occured handling 'nvme_disk2':
+    # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
 
 
-class ImpishTestNvme(relbase.impish, TestNvmeAbs):
+class LunarTestNvme(relbase.lunar, TestNvmeAbs):
     __test__ = False
+    # An error occured handling 'nvme_disk2':
+    # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
 
 
 class TestNvmeBcacheAbs(TestNvmeAbs):
@@ -153,11 +157,11 @@ class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
     __test__ = True
 
 
-class HirsuteTestNvmeBcache(relbase.hirsute, TestNvmeBcacheAbs):
+class JammyTestNvmeBcache(relbase.jammy, TestNvmeBcacheAbs):
     __test__ = True
 
 
-class ImpishTestNvmeBcache(relbase.impish, TestNvmeBcacheAbs):
+class LunarTestNvmeBcache(relbase.lunar, TestNvmeBcacheAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py
index a5533f9..e541c35 100644
--- a/tests/vmtests/test_panic.py
+++ b/tests/vmtests/test_panic.py
@@ -29,11 +29,11 @@ class FocalTestInstallPanic(relbase.focal, TestInstallPanic):
     __test__ = True
 
 
-class HirsuteTestInstallPanic(relbase.hirsute, TestInstallPanic):
+class JammyTestInstallPanic(relbase.jammy, TestInstallPanic):
     __test__ = True
 
 
-class ImpishTestInstallPanic(relbase.impish, TestInstallPanic):
+class LunarTestInstallPanic(relbase.lunar, TestInstallPanic):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
index fa33ec5..5c3130d 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -65,11 +65,11 @@ class FocalTestPollinateUserAgent(relbase.focal, TestPollinateUserAgent):
     __test__ = True
 
 
-class HirsuteTestPollinateUserAgent(relbase.hirsute, TestPollinateUserAgent):
+class JammyTestPollinateUserAgent(relbase.jammy, TestPollinateUserAgent):
     __test__ = True
 
 
-class ImpishTestPollinateUserAgent(relbase.impish, TestPollinateUserAgent):
+class LunarTestPollinateUserAgent(relbase.lunar, TestPollinateUserAgent):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
index 74fe29e..69ddc68 100644
--- a/tests/vmtests/test_preserve.py
+++ b/tests/vmtests/test_preserve.py
@@ -29,11 +29,11 @@ class FocalTestPreserve(relbase.focal, TestPreserve):
     __test__ = True
 
 
-class HirsuteTestPreserve(relbase.hirsute, TestPreserve):
+class JammyTestPreserve(relbase.jammy, TestPreserve):
     __test__ = True
 
 
-class ImpishTestPreserve(relbase.impish, TestPreserve):
+class LunarTestPreserve(relbase.lunar, TestPreserve):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py
index 46edd3f..24eac72 100644
--- a/tests/vmtests/test_preserve_bcache.py
+++ b/tests/vmtests/test_preserve_bcache.py
@@ -60,11 +60,11 @@ class FocalTestPreserveBcache(relbase.focal, TestPreserveBcache):
     __test__ = True
 
 
-class HirsuteTestPreserveBcache(relbase.hirsute, TestPreserveBcache):
+class JammyTestPreserveBcache(relbase.jammy, TestPreserveBcache):
     __test__ = True
 
 
-class ImpishTestPreserveBcache(relbase.impish, TestPreserveBcache):
+class LunarTestPreserveBcache(relbase.lunar, TestPreserveBcache):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py
index 0c09c11..4344461 100644
--- a/tests/vmtests/test_preserve_lvm.py
+++ b/tests/vmtests/test_preserve_lvm.py
@@ -73,11 +73,11 @@ class FocalTestLvmPreserve(relbase.focal, TestLvmPreserveAbs):
     __test__ = True
 
 
-class HirsuteTestLvmPreserve(relbase.hirsute, TestLvmPreserveAbs):
+class JammyTestLvmPreserve(relbase.jammy, TestLvmPreserveAbs):
     __test__ = True
 
 
-class ImpishTestLvmPreserve(relbase.impish, TestLvmPreserveAbs):
+class LunarTestLvmPreserve(relbase.lunar, TestLvmPreserveAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py
index 4db6c2b..24813c4 100644
--- a/tests/vmtests/test_preserve_partition_wipe_vg.py
+++ b/tests/vmtests/test_preserve_partition_wipe_vg.py
@@ -29,11 +29,11 @@ class FocalTestPreserveWipeLvm(relbase.focal, TestPreserveWipeLvm):
     __test__ = True
 
 
-class HirsuteTestPreserveWipeLvm(relbase.hirsute, TestPreserveWipeLvm):
+class JammyTestPreserveWipeLvm(relbase.jammy, TestPreserveWipeLvm):
     __test__ = True
 
 
-class ImpishTestPreserveWipeLvm(relbase.impish, TestPreserveWipeLvm):
+class LunarTestPreserveWipeLvm(relbase.lunar, TestPreserveWipeLvm):
     __test__ = True
 
 
@@ -56,13 +56,11 @@ class FocalTestPreserveWipeLvmSimple(relbase.focal, TestPreserveWipeLvmSimple):
     __test__ = True
 
 
-class HirsuteTestPreserveWipeLvmSimple(relbase.hirsute,
-                                       TestPreserveWipeLvmSimple):
+class JammyTestPreserveWipeLvmSimple(relbase.jammy, TestPreserveWipeLvmSimple):
     __test__ = True
 
 
-class ImpishTestPreserveWipeLvmSimple(relbase.impish,
-                                      TestPreserveWipeLvmSimple):
+class LunarTestPreserveWipeLvmSimple(relbase.lunar, TestPreserveWipeLvmSimple):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
index 04c16b7..6b8b580 100644
--- a/tests/vmtests/test_preserve_raid.py
+++ b/tests/vmtests/test_preserve_raid.py
@@ -29,11 +29,11 @@ class FocalTestPreserveRAID(relbase.focal, TestPreserveRAID):
     __test__ = True
 
 
-class HirsuteTestPreserveRAID(relbase.hirsute, TestPreserveRAID):
+class JammyTestPreserveRAID(relbase.jammy, TestPreserveRAID):
     __test__ = True
 
 
-class ImpishTestPreserveRAID(relbase.impish, TestPreserveRAID):
+class LunarTestPreserveRAID(relbase.lunar, TestPreserveRAID):
     __test__ = True
 
 
@@ -65,13 +65,13 @@ class FocalTestPartitionExistingRAID(
     __test__ = True
 
 
-class HirsuteTestPartitionExistingRAID(
-        relbase.hirsute, TestPartitionExistingRAID):
+class JammyTestPartitionExistingRAID(
+        relbase.jammy, TestPartitionExistingRAID):
     __test__ = True
 
 
-class ImpishTestPartitionExistingRAID(
-        relbase.impish, TestPartitionExistingRAID):
+class LunarTestPartitionExistingRAID(
+        relbase.lunar, TestPartitionExistingRAID):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_python_apt.py b/tests/vmtests/test_python_apt.py
index 4162608..9593160 100644
--- a/tests/vmtests/test_python_apt.py
+++ b/tests/vmtests/test_python_apt.py
@@ -31,11 +31,11 @@ class FocalTestPythonApt(relbase.focal, TestPythonApt):
     __test__ = True
 
 
-class HirsuteTestPythonApt(relbase.hirsute, TestPythonApt):
+class JammyTestPythonApt(relbase.jammy, TestPythonApt):
     __test__ = True
 
 
-class ImpishTestPythonApt(relbase.impish, TestPythonApt):
+class LunarTestPythonApt(relbase.lunar, TestPythonApt):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
index e682f34..d783dcb 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -92,11 +92,11 @@ class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class HirsuteTestRaid5Bcache(relbase.hirsute, TestMdadmBcacheAbs):
+class JammyTestRaid5Bcache(relbase.jammy, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class ImpishTestRaid5Bcache(relbase.impish, TestMdadmBcacheAbs):
+class LunarTestRaid5Bcache(relbase.lunar, TestMdadmBcacheAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py
index a2bd1be..101f334 100644
--- a/tests/vmtests/test_raid_partition_to_disk.py
+++ b/tests/vmtests/test_raid_partition_to_disk.py
@@ -22,11 +22,11 @@ class FocalTestRAIDPartitionToDisk(relbase.focal, TestRAIDPartitionToDisk):
     __test__ = True
 
 
-class HirsuteTestRAIDPartitionToDisk(relbase.hirsute, TestRAIDPartitionToDisk):
+class JammyTestRAIDPartitionToDisk(relbase.jammy, TestRAIDPartitionToDisk):
     __test__ = True
 
 
-class ImpishTestRAIDPartitionToDisk(relbase.impish, TestRAIDPartitionToDisk):
+class LunarTestRAIDPartitionToDisk(relbase.lunar, TestRAIDPartitionToDisk):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py
index 81c0cb0..3456981 100644
--- a/tests/vmtests/test_reuse_lvm_member.py
+++ b/tests/vmtests/test_reuse_lvm_member.py
@@ -26,13 +26,13 @@ class FocalTestReuseLVMMemberPartition(relbase.focal,
     __test__ = True
 
 
-class HirsuteTestReuseLVMMemberPartition(relbase.hirsute,
-                                         TestReuseLVMMemberPartition):
+class JammyTestReuseLVMMemberPartition(relbase.jammy,
+                                       TestReuseLVMMemberPartition):
     __test__ = True
 
 
-class ImpishTestReuseLVMMemberPartition(relbase.impish,
-                                        TestReuseLVMMemberPartition):
+class LunarTestReuseLVMMemberPartition(relbase.lunar,
+                                       TestReuseLVMMemberPartition):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py
index ed52f5b..1befdf8 100644
--- a/tests/vmtests/test_reuse_msdos_partitions.py
+++ b/tests/vmtests/test_reuse_msdos_partitions.py
@@ -23,13 +23,13 @@ class FocalTestReuseMSDOSPartitions(relbase.focal,
     __test__ = True
 
 
-class HirsuteTestReuseMSDOSPartitions(relbase.hirsute,
-                                      TestReuseMSDOSPartitions):
+class JammyTestReuseMSDOSPartitions(relbase.jammy,
+                                    TestReuseMSDOSPartitions):
     __test__ = True
 
 
-class ImpishTestReuseMSDOSPartitions(relbase.impish,
-                                     TestReuseMSDOSPartitions):
+class LunarTestReuseMSDOSPartitions(relbase.lunar,
+                                    TestReuseMSDOSPartitions):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py
index 7611140..44edd59 100644
--- a/tests/vmtests/test_reuse_raid_member.py
+++ b/tests/vmtests/test_reuse_raid_member.py
@@ -32,11 +32,11 @@ class FocalTestReuseRAIDMember(relbase.focal, TestReuseRAIDMember):
     __test__ = True
 
 
-class HirsuteTestReuseRAIDMember(relbase.hirsute, TestReuseRAIDMember):
+class JammyTestReuseRAIDMember(relbase.jammy, TestReuseRAIDMember):
     __test__ = True
 
 
-class ImpishTestReuseRAIDMember(relbase.impish, TestReuseRAIDMember):
+class LunarTestReuseRAIDMember(relbase.lunar, TestReuseRAIDMember):
     __test__ = True
 
 
@@ -50,13 +50,13 @@ class FocalTestReuseRAIDMemberPartition(relbase.focal,
     __test__ = True
 
 
-class HirsuteTestReuseRAIDMemberPartition(relbase.hirsute,
-                                          TestReuseRAIDMemberPartition):
+class JammyTestReuseRAIDMemberPartition(relbase.jammy,
+                                        TestReuseRAIDMemberPartition):
     __test__ = True
 
 
-class ImpishTestReuseRAIDMemberPartition(relbase.impish,
-                                         TestReuseRAIDMemberPartition):
+class LunarTestReuseRAIDMemberPartition(relbase.lunar,
+                                        TestReuseRAIDMemberPartition):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
index 958e43f..94f4f90 100644
--- a/tests/vmtests/test_reuse_uefi_esp.py
+++ b/tests/vmtests/test_reuse_uefi_esp.py
@@ -42,14 +42,14 @@ class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs):
         return super().test_efiboot_menu_has_one_distro_entry()
 
 
-class HirsuteTestUefiReuseEsp(relbase.hirsute, TestUefiReuseEspAbs):
+class JammyTestUefiReuseEsp(relbase.jammy, TestUefiReuseEspAbs):
     __test__ = True
 
     def test_efiboot_menu_has_one_distro_entry(self):
         return super().test_efiboot_menu_has_one_distro_entry()
 
 
-class ImpishTestUefiReuseEsp(relbase.impish, TestUefiReuseEspAbs):
+class LunarTestUefiReuseEsp(relbase.lunar, TestUefiReuseEspAbs):
     __test__ = True
 
     def test_efiboot_menu_has_one_distro_entry(self):
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index 2b91f0b..0cfda04 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -47,14 +47,14 @@ class FocalTestSimple(relbase.focal, TestSimple):
         self.output_files_exist(["netplan.yaml"])
 
 
-class HirsuteTestSimple(relbase.hirsute, TestSimple):
+class JammyTestSimple(relbase.jammy, TestSimple):
     __test__ = True
 
     def test_output_files_exist(self):
         self.output_files_exist(["netplan.yaml"])
 
 
-class ImpishTestSimple(relbase.impish, TestSimple):
+class LunarTestSimple(relbase.lunar, TestSimple):
     __test__ = True
 
     def test_output_files_exist(self):
@@ -110,14 +110,14 @@ class FocalTestSimpleStorage(relbase.focal, TestSimpleStorage):
         self.output_files_exist(["netplan.yaml"])
 
 
-class HirsuteTestSimpleStorage(relbase.hirsute, TestSimpleStorage):
+class JammyTestSimpleStorage(relbase.jammy, TestSimpleStorage):
     __test__ = True
 
     def test_output_files_exist(self):
         self.output_files_exist(["netplan.yaml"])
 
 
-class ImpishTestSimpleStorage(relbase.impish, TestSimpleStorage):
+class LunarTestSimpleStorage(relbase.lunar, TestSimpleStorage):
     __test__ = True
 
     def test_output_files_exist(self):
@@ -150,14 +150,14 @@ class FocalTestGrubNoDefaults(relbase.focal, TestGrubNoDefaults):
         self.output_files_exist(["netplan.yaml"])
 
 
-class HirsuteTestGrubNoDefaults(relbase.hirsute, TestGrubNoDefaults):
+class JammyTestGrubNoDefaults(relbase.jammy, TestGrubNoDefaults):
     __test__ = True
 
     def test_output_files_exist(self):
         self.output_files_exist(["netplan.yaml"])
 
 
-class ImpishTestGrubNoDefaults(relbase.impish, TestGrubNoDefaults):
+class LunarTestGrubNoDefaults(relbase.lunar, TestGrubNoDefaults):
     __test__ = True
 
     def test_output_files_exist(self):
diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
index 1a90a7d..e4f4753 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -100,11 +100,11 @@ class FocalUefiTestBasic(relbase.focal, TestBasicAbs):
     __test__ = True
 
 
-class HirsuteUefiTestBasic(relbase.hirsute, TestBasicAbs):
+class JammyUefiTestBasic(relbase.jammy, TestBasicAbs):
     __test__ = True
 
 
-class ImpishUefiTestBasic(relbase.impish, TestBasicAbs):
+class LunarUefiTestBasic(relbase.lunar, TestBasicAbs):
     __test__ = True
 
 
@@ -128,12 +128,12 @@ class FocalUefiTestBasic4k(relbase.focal, TestBasicAbs):
     disk_block_size = 4096
 
 
-class HirsuteUefiTestBasic4k(relbase.hirsute, TestBasicAbs):
+class JammyUefiTestBasic4k(relbase.jammy, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
 
 
-class ImpishUefiTestBasic4k(relbase.impish, TestBasicAbs):
+class LunarUefiTestBasic4k(relbase.lunar, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
 
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index 0e310c6..9ca2b4b 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -101,12 +101,12 @@ class FocalTestZfsRoot(relbase.focal, TestZfsRootAbs):
     mem = 4096
 
 
-class HirsuteTestZfsRoot(relbase.hirsute, TestZfsRootAbs):
+class JammyTestZfsRoot(relbase.jammy, TestZfsRootAbs):
     __test__ = True
     mem = 4096
 
 
-class ImpishTestZfsRoot(relbase.impish, TestZfsRootAbs):
+class LunarTestZfsRoot(relbase.lunar, TestZfsRootAbs):
     __test__ = True
     mem = 4096
 
@@ -135,12 +135,12 @@ class FocalTestZfsRootFsType(relbase.focal, TestZfsRootFsTypeAbs):
     mem = 4096
 
 
-class HirsuteTestZfsRootFsType(relbase.hirsute, TestZfsRootFsTypeAbs):
+class JammyTestZfsRootFsType(relbase.jammy, TestZfsRootFsTypeAbs):
     __test__ = True
     mem = 4096
 
 
-class ImpishTestZfsRootFsType(relbase.impish, TestZfsRootFsTypeAbs):
+class LunarTestZfsRootFsType(relbase.lunar, TestZfsRootFsTypeAbs):
     __test__ = True
     mem = 4096