Merge ~dbungert/curtin:cloud-init-vmtest-ctd into curtin:master

[Dan Bungert]

Revert "vmtests: add mantic after jammy"

This reverts commit abebab1e1e30a16d4be891a051060e81254ff0c5.

The motivation right now around vmtests is unblocking cloud-init SRU
testing. Mantic testing is not on their test path, for several
reasons, mostly with the fact that this testing is focused on
network cases which are not valid for Ubuntu Mantic.

Also, the underlying images aren't available anyhow on the image
stream, so these tests can't even run yet unless environment
variable MAAS_IMAGE_STREAM=candidate is set.

These mantic network tests fail if we force them to run in spite of
the above.

Disable for now and let's revisit.

[Chris Peterson (cpete)]

review: Approve

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

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

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

review: Approve (continuous-integration)

diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index 7519c57..56e5e8c 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -172,13 +172,6 @@ class _JammyBase(_UbuntuBase):
         subarch = "ga-22.04"
 
 
-class _ManticBase(_UbuntuBase):
-    release = "mantic"
-    target_release = "mantic"
-    if _UbuntuBase.arch == "arm64":
-        subarch = "ga-23.10"
-
-
 class _Releases(object):
     trusty = _TrustyBase
     precise = _PreciseBase
@@ -198,7 +191,6 @@ class _Releases(object):
     eoan = _EoanBase
     focal = _FocalBase
     jammy = _JammyBase
-    mantic = _ManticBase
 
 
 class _CentosReleases(object):
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index 50ea224..a847910 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -72,8 +72,4 @@ class JammyTestAptConfigCMDCMD(relbase.jammy, TestAptConfigCMD):
     __test__ = True
 
 
-class ManticTestAptConfigCMDCMD(relbase.mantic, TestAptConfigCMD):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 1a99395..f626f2e 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -238,10 +238,6 @@ class JammyTestBasic(relbase.jammy, TestBasicAbs):
     __test__ = True
 
 
-class ManticTestBasic(relbase.mantic, TestBasicAbs):
-    __test__ = True
-
-
 class TestBasicScsiAbs(TestBasicAbs):
     arch_skip = [
         'arm64',  # arm64 is UEFI only
@@ -362,8 +358,4 @@ class JammyTestScsiBasic(relbase.jammy, TestBasicScsiAbs):
     __test__ = True
 
 
-class ManticTestScsiBasic(relbase.mantic, TestBasicScsiAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
index 3ab7544..154f26d 100644
--- a/tests/vmtests/test_basic_dasd.py
+++ b/tests/vmtests/test_basic_dasd.py
@@ -60,8 +60,4 @@ class JammyTestBasicDasd(relbase.jammy, TestBasicDasd):
     __test__ = True
 
 
-class ManticTestBasicDasd(relbase.mantic, TestBasicDasd):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
index f4d8731..2e62f0b 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -72,8 +72,4 @@ class JammyBcacheBasic(relbase.jammy, TestBcacheBasic):
     __test__ = True
 
 
-class ManticBcacheBasic(relbase.mantic, TestBcacheBasic):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
index 6eb781c..82a765a 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -27,8 +27,4 @@ class JammyTestBcacheBug1718699(relbase.jammy, TestBcacheBug1718699):
     __test__ = True
 
 
-class ManticTestBcacheBug1718699(relbase.mantic, TestBcacheBug1718699):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
index 9bc7287..15cce59 100644
--- a/tests/vmtests/test_bcache_ceph.py
+++ b/tests/vmtests/test_bcache_ceph.py
@@ -83,10 +83,6 @@ class JammyTestBcacheCeph(relbase.jammy, TestBcacheCeph):
     __test__ = True
 
 
-class ManticTestBcacheCeph(relbase.mantic, TestBcacheCeph):
-    __test__ = True
-
-
 class TestBcacheCephLvm(TestBcacheCeph):
     test_type = 'storage'
     nr_cpus = 2
@@ -117,8 +113,4 @@ class JammyTestBcacheCephLvm(relbase.jammy, TestBcacheCephLvm):
     __test__ = True
 
 
-class ManticTestBcacheCephLvm(relbase.mantic, TestBcacheCephLvm):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
index 52cfd03..c3c41bc 100644
--- a/tests/vmtests/test_bcache_partitions.py
+++ b/tests/vmtests/test_bcache_partitions.py
@@ -33,8 +33,4 @@ class JammyTestBcachePartitions(relbase.jammy, TestBcachePartitions):
     __test__ = True
 
 
-class ManticTestBcachePartitions(relbase.mantic, TestBcachePartitions):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
index 034f10f..75084b0 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -247,8 +247,4 @@ class JammyTestFsBattery(relbase.jammy, TestFsBattery):
     __test__ = True
 
 
-class ManticTestFsBattery(relbase.mantic, TestFsBattery):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index 05c28fc..6ad343d 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -80,8 +80,4 @@ class JammyTestIscsiBasic(relbase.jammy, TestBasicIscsiAbs):
     __test__ = True
 
 
-class ManticTestIscsiBasic(relbase.mantic, TestBasicIscsiAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
index 299fef7..ba39af2 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -40,8 +40,4 @@ class JammyTestJournaldReporter(relbase.jammy, TestJournaldReporter):
     __test__ = True
 
 
-class ManticTestJournaldReporter(relbase.mantic, TestJournaldReporter):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index 052d339..e15838e 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -85,8 +85,4 @@ class JammyTestLvm(relbase.jammy, TestLvmAbs):
     __test__ = True
 
 
-class ManticTestLvm(relbase.mantic, TestLvmAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
index 76117c1..94e523b 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -103,8 +103,4 @@ class JammyTestIscsiLvm(relbase.jammy, TestLvmIscsiAbs):
     __test__ = True
 
 
-class ManticTestIscsiLvm(relbase.mantic, TestLvmIscsiAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
index d9eb9ff..b265318 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -63,8 +63,4 @@ class JammyTestLvmOverRaid(relbase.jammy, TestLvmOverRaidAbs):
     __test__ = True
 
 
-class ManticTestLvmOverRaid(relbase.mantic, 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 3d14a2b..6464f22 100644
--- a/tests/vmtests/test_lvm_root.py
+++ b/tests/vmtests/test_lvm_root.py
@@ -101,13 +101,6 @@ class JammyTestLvmRootExt4(relbase.jammy, TestLvmRootAbs):
     }
 
 
-class ManticTestLvmRootExt4(relbase.mantic, TestLvmRootAbs):
-    __test__ = True
-    conf_replace = {
-        '__ROOTFS_FORMAT__': 'ext4',
-    }
-
-
 class XenialTestLvmRootXfs(relbase.xenial, TestLvmRootAbs):
     __test__ = True
     conf_replace = {
@@ -162,14 +155,6 @@ class JammyTestUefiLvmRootExt4(relbase.jammy, TestUefiLvmRootAbs):
     }
 
 
-class ManticTestUefiLvmRootExt4(relbase.mantic, TestUefiLvmRootAbs):
-    __test__ = True
-    conf_replace = {
-        '__BOOTFS_FORMAT__': 'ext4',
-        '__ROOTFS_FORMAT__': 'ext4',
-    }
-
-
 class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs):
     __test__ = True
     conf_replace = {
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 95c2d58..54b3588 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -162,10 +162,6 @@ class JammyTestMdadmBcache(relbase.jammy, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class ManticTestMdadmBcache(relbase.mantic, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 class TestMirrorbootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot.yaml"
@@ -211,10 +207,6 @@ class JammyTestMirrorboot(relbase.jammy, TestMirrorbootAbs):
     __test__ = True
 
 
-class ManticTestMirrorboot(relbase.mantic, TestMirrorbootAbs):
-    __test__ = True
-
-
 class TestMirrorbootPartitionsAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-msdos-partition.yaml"
@@ -265,11 +257,6 @@ class JammyTestMirrorbootPartitions(relbase.jammy,
     __test__ = True
 
 
-class ManticTestMirrorbootPartitions(relbase.mantic,
-                                     TestMirrorbootPartitionsAbs):
-    __test__ = True
-
-
 class TestMirrorbootPartitionsUEFIAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-uefi.yaml"
@@ -365,11 +352,6 @@ class JammyTestMirrorbootPartitionsUEFI(relbase.jammy,
     __test__ = True
 
 
-class ManticTestMirrorbootPartitionsUEFI(relbase.mantic,
-                                         TestMirrorbootPartitionsUEFIAbs):
-    __test__ = True
-
-
 class TestRaid5bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid5boot.yaml"
@@ -418,10 +400,6 @@ class JammyTestRaid5boot(relbase.jammy, TestRaid5bootAbs):
     __test__ = True
 
 
-class ManticTestRaid5boot(relbase.mantic, TestRaid5bootAbs):
-    __test__ = True
-
-
 class TestRaid6bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid6boot.yaml"
@@ -483,10 +461,6 @@ class JammyTestRaid6boot(relbase.jammy, TestRaid6bootAbs):
     __test__ = True
 
 
-class ManticTestRaid6boot(relbase.mantic, TestRaid6bootAbs):
-    __test__ = True
-
-
 class TestRaid10bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid10boot.yaml"
@@ -534,10 +508,6 @@ class JammyTestRaid10boot(relbase.jammy, TestRaid10bootAbs):
     __test__ = True
 
 
-class ManticTestRaid10boot(relbase.mantic, TestRaid10bootAbs):
-    __test__ = True
-
-
 class TestAllindataAbs(TestMdadmAbs):
     # more complex, needs more time
     # alternative config for more complex setup
@@ -642,8 +612,4 @@ class JammyTestAllindata(relbase.jammy, TestAllindataAbs):
     __test__ = True
 
 
-class ManticTestAllindata(relbase.mantic, TestAllindataAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
index 7280082..128712c 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -58,8 +58,4 @@ class JammyTestIscsiMdadm(relbase.jammy, TestMdadmIscsiAbs):
     __test__ = True
 
 
-class ManticTestIscsiMdadm(relbase.mantic, TestMdadmIscsiAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index 28b5acd..0067737 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -166,10 +166,6 @@ class JammyTestMultipathBasic(relbase.jammy, TestMultipathBasicAbs):
     __test__ = True
 
 
-class ManticTestMultipathBasic(relbase.mantic, TestMultipathBasicAbs):
-    __test__ = True
-
-
 class TestMultipathReuseAbs(TestMultipathBasicAbs):
     conf_file = "examples/tests/multipath-reuse.yaml"
 
@@ -182,8 +178,4 @@ class JammyTestMultipathReuse(relbase.jammy, TestMultipathReuseAbs):
     __test__ = True
 
 
-class ManticTestMultipathReuse(relbase.mantic, TestMultipathReuseAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py
index 1d60be7..aaeefd5 100644
--- a/tests/vmtests/test_multipath_lvm.py
+++ b/tests/vmtests/test_multipath_lvm.py
@@ -64,10 +64,6 @@ class JammyTestMultipathLvm(relbase.jammy, TestMultipathLvmAbs):
     __test__ = True
 
 
-class ManticTestMultipathLvm(relbase.mantic, TestMultipathLvmAbs):
-    __test__ = True
-
-
 class TestMultipathLvmPartWipeAbs(TestMultipathLvmAbs):
     conf_file = "examples/tests/multipath-lvm-part-wipe.yaml"
 
@@ -82,9 +78,4 @@ class JammyTestMultipathLvmPartWipe(relbase.jammy,
     __test__ = True
 
 
-class ManticTestMultipathLvmPartWipe(relbase.mantic,
-                                     TestMultipathLvmPartWipeAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index e838934..4b16aeb 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -482,10 +482,6 @@ class JammyTestNetworkBasic(relbase.jammy, TestNetworkBasicAbs):
     __test__ = True
 
 
-class ManticTestNetworkBasic(relbase.mantic, TestNetworkBasicAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkBasic(centos_relbase.centos70_xenial,
                                CentosTestNetworkBasicAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index 1570c8f..628a8b7 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -55,8 +55,4 @@ class JammyTestNetworkAlias(relbase.jammy, TestNetworkAliasAbs):
     __test__ = True
 
 
-class ManticTestNetworkAlias(relbase.mantic, TestNetworkAliasAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
index fb91179..ea411d8 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -65,10 +65,6 @@ class JammyTestBonding(relbase.jammy, TestNetworkBondingAbs):
     __test__ = True
 
 
-class ManticTestBonding(relbase.mantic, TestNetworkBondingAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkBonding(centos_relbase.centos70_xenial,
                                  CentosTestNetworkBondingAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index a46841f..c8c52b3 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -237,10 +237,6 @@ class JammyTestBridging(relbase.jammy, TestBridgeNetworkAbs):
     __test__ = True
 
 
-class ManticTestBridging(relbase.mantic, TestBridgeNetworkAbs):
-    __test__ = True
-
-
 class XenialTestBridgingV2(relbase.xenial, TestBridgeNetworkAbs):
     """ This class only needs to verify that when provided a v2 config
         that the Xenial network packages are installed. """
diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py
index 3494d38..b4f9eb7 100644
--- a/tests/vmtests/test_network_disabled.py
+++ b/tests/vmtests/test_network_disabled.py
@@ -83,18 +83,4 @@ class JammyCurtinDisableCloudInitNetworkingVersion1(relbase.jammy, TestKlass3):
     __test__ = True
 
 
-class ManticCurtinDisableNetworkRendering(relbase.mantic, TestKlass1):
-    __test__ = True
-
-
-class ManticCurtinDisableCloudInitNetworking(relbase.mantic, TestKlass2):
-    __test__ = True
-
-
-class ManticCurtinDisableCloudInitNetworkingVersion1(
-    relbase.mantic, TestKlass3
-):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index 5b96b16..5c31b48 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -61,10 +61,6 @@ class JammyTestNetworkIPV6(relbase.jammy, TestNetworkIPV6Abs):
     __test__ = True
 
 
-class ManticTestNetworkIPV6(relbase.mantic, TestNetworkIPV6Abs):
-    __test__ = True
-
-
 class Centos70TestNetworkIPV6(centos_relbase.centos70_xenial,
                               CentosTestNetworkIPV6Abs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index 8e070e8..5352bfe 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -31,10 +31,6 @@ class JammyTestNetworkIPV6Static(relbase.jammy, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
-class ManticTestNetworkIPV6Static(relbase.mantic, TestNetworkIPV6StaticAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkIPV6Static(centos_relbase.centos70_xenial,
                                     CentosTestNetworkIPV6StaticAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 0e7e302..8f3fe64 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -30,10 +30,6 @@ class JammyTestNetworkIPV6Vlan(relbase.jammy, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
-class ManticTestNetworkIPV6Vlan(relbase.mantic, TestNetworkIPV6VlanAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkIPV6Vlan(centos_relbase.centos70_xenial,
                                   CentosTestNetworkIPV6VlanAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index 7aff7b2..67d5d01 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -197,10 +197,6 @@ class JammyTestNetworkMtu(relbase.jammy, TestNetworkMtuNetworkdAbs):
     __test__ = True
 
 
-class ManticTestNetworkMtu(relbase.mantic, TestNetworkMtuNetworkdAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkMtu(centos_relbase.centos70_xenial,
                              CentosTestNetworkMtuAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py
index d6e23c8..e168a0d 100644
--- a/tests/vmtests/test_network_ovs.py
+++ b/tests/vmtests/test_network_ovs.py
@@ -42,8 +42,4 @@ class JammyTestNetworkOvs(relbase.jammy, TestNetworkOvsAbs):
     __test__ = True
 
 
-class ManticTestNetworkOvs(relbase.mantic, TestNetworkOvsAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index 9a2adb3..620c952 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -36,10 +36,6 @@ class JammyTestNetworkStatic(relbase.jammy, TestNetworkStaticAbs):
     __test__ = True
 
 
-class ManticTestNetworkStatic(relbase.mantic, TestNetworkStaticAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkStatic(centos_relbase.centos70_xenial,
                                 CentosTestNetworkStaticAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index 8ddeeaf..0258113 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -38,11 +38,6 @@ class JammyTestNetworkStaticRoutes(relbase.jammy,
     __test__ = True
 
 
-class ManticTestNetworkStaticRoutes(relbase.mantic,
-                                    TestNetworkStaticRoutesAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkStaticRoutes(centos_relbase.centos70_xenial,
                                       CentosTestNetworkStaticRoutesAbs):
     __test__ = False
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 6fca423..0ab62bb 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -84,10 +84,6 @@ class JammyTestNetworkVlan(relbase.jammy, TestNetworkVlanAbs):
     __test__ = True
 
 
-class ManticTestNetworkVlan(relbase.mantic, TestNetworkVlanAbs):
-    __test__ = True
-
-
 class Centos70TestNetworkVlan(centos_relbase.centos70_xenial,
                               CentosTestNetworkVlanAbs):
     __test__ = True
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index d458fca..dd071e9 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -85,12 +85,6 @@ class JammyTestNvme(relbase.jammy, TestNvmeAbs):
     # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
 
 
-class ManticTestNvme(relbase.mantic, TestNvmeAbs):
-    __test__ = False
-    # An error occured handling 'nvme_disk2':
-    # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
-
-
 class TestNvmeBcacheAbs(TestNvmeAbs):
     arch_skip = [
         "s390x",  # nvme is a pci device, no pci on s390x
@@ -161,8 +155,4 @@ class JammyTestNvmeBcache(relbase.jammy, TestNvmeBcacheAbs):
     __test__ = True
 
 
-class ManticTestNvmeBcache(relbase.mantic, TestNvmeBcacheAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py
index d3861e3..d8d3f22 100644
--- a/tests/vmtests/test_panic.py
+++ b/tests/vmtests/test_panic.py
@@ -33,8 +33,4 @@ class JammyTestInstallPanic(relbase.jammy, TestInstallPanic):
     __test__ = True
 
 
-class ManticTestInstallPanic(relbase.mantic, TestInstallPanic):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
index 3215142..5a4b0fb 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -69,8 +69,4 @@ class JammyTestPollinateUserAgent(relbase.jammy, TestPollinateUserAgent):
     __test__ = True
 
 
-class ManticTestPollinateUserAgent(relbase.mantic, TestPollinateUserAgent):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
index 4fbf832..d6eb922 100644
--- a/tests/vmtests/test_preserve.py
+++ b/tests/vmtests/test_preserve.py
@@ -33,8 +33,4 @@ class JammyTestPreserve(relbase.jammy, TestPreserve):
     __test__ = True
 
 
-class ManticTestPreserve(relbase.mantic, TestPreserve):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py
index 23e4dee..2384be8 100644
--- a/tests/vmtests/test_preserve_bcache.py
+++ b/tests/vmtests/test_preserve_bcache.py
@@ -64,8 +64,4 @@ class JammyTestPreserveBcache(relbase.jammy, TestPreserveBcache):
     __test__ = True
 
 
-class ManticTestPreserveBcache(relbase.mantic, TestPreserveBcache):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py
index 4b5401d..1eb954e 100644
--- a/tests/vmtests/test_preserve_lvm.py
+++ b/tests/vmtests/test_preserve_lvm.py
@@ -77,8 +77,4 @@ class JammyTestLvmPreserve(relbase.jammy, TestLvmPreserveAbs):
     __test__ = True
 
 
-class ManticTestLvmPreserve(relbase.mantic, TestLvmPreserveAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py
index e9759bf..76fa9c3 100644
--- a/tests/vmtests/test_preserve_partition_wipe_vg.py
+++ b/tests/vmtests/test_preserve_partition_wipe_vg.py
@@ -33,10 +33,6 @@ class JammyTestPreserveWipeLvm(relbase.jammy, TestPreserveWipeLvm):
     __test__ = True
 
 
-class ManticTestPreserveWipeLvm(relbase.mantic, TestPreserveWipeLvm):
-    __test__ = True
-
-
 class TestPreserveWipeLvmSimple(VMBaseClass):
     conf_file = "examples/tests/preserve-partition-wipe-vg-simple.yaml"
     uefi = False
@@ -60,10 +56,4 @@ class JammyTestPreserveWipeLvmSimple(relbase.jammy, TestPreserveWipeLvmSimple):
     __test__ = True
 
 
-class ManticTestPreserveWipeLvmSimple(
-    relbase.mantic, TestPreserveWipeLvmSimple
-):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
index 7e42e7e..cf97203 100644
--- a/tests/vmtests/test_preserve_raid.py
+++ b/tests/vmtests/test_preserve_raid.py
@@ -33,10 +33,6 @@ class JammyTestPreserveRAID(relbase.jammy, TestPreserveRAID):
     __test__ = True
 
 
-class ManticTestPreserveRAID(relbase.mantic, TestPreserveRAID):
-    __test__ = True
-
-
 class TestPartitionExistingRAID(VMBaseClass):
     """ Test that curtin can repartition an existing RAID. """
     conf_file = "examples/tests/partition-existing-raid.yaml"
@@ -70,9 +66,4 @@ class JammyTestPartitionExistingRAID(
     __test__ = True
 
 
-class ManticTestPartitionExistingRAID(
-        relbase.mantic, TestPartitionExistingRAID):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_python_apt.py b/tests/vmtests/test_python_apt.py
index 1542275..ed2e007 100644
--- a/tests/vmtests/test_python_apt.py
+++ b/tests/vmtests/test_python_apt.py
@@ -35,8 +35,4 @@ class JammyTestPythonApt(relbase.jammy, TestPythonApt):
     __test__ = True
 
 
-class ManticTestPythonApt(relbase.mantic, TestPythonApt):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
index 53f55cc..e04120d 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -96,8 +96,4 @@ class JammyTestRaid5Bcache(relbase.jammy, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class ManticTestRaid5Bcache(relbase.mantic, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py
index 7a18abe..fa1939c 100644
--- a/tests/vmtests/test_raid_partition_to_disk.py
+++ b/tests/vmtests/test_raid_partition_to_disk.py
@@ -26,8 +26,4 @@ class JammyTestRAIDPartitionToDisk(relbase.jammy, TestRAIDPartitionToDisk):
     __test__ = True
 
 
-class ManticTestRAIDPartitionToDisk(relbase.mantic, TestRAIDPartitionToDisk):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py
index e22598e..cd7efd6 100644
--- a/tests/vmtests/test_reuse_lvm_member.py
+++ b/tests/vmtests/test_reuse_lvm_member.py
@@ -31,9 +31,4 @@ class JammyTestReuseLVMMemberPartition(relbase.jammy,
     __test__ = True
 
 
-class ManticTestReuseLVMMemberPartition(relbase.mantic,
-                                        TestReuseLVMMemberPartition):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py
index 562db39..1561f3f 100644
--- a/tests/vmtests/test_reuse_msdos_partitions.py
+++ b/tests/vmtests/test_reuse_msdos_partitions.py
@@ -28,9 +28,4 @@ class JammyTestReuseMSDOSPartitions(relbase.jammy,
     __test__ = True
 
 
-class ManticTestReuseMSDOSPartitions(relbase.mantic,
-                                     TestReuseMSDOSPartitions):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py
index 7eb96b4..43c7185 100644
--- a/tests/vmtests/test_reuse_raid_member.py
+++ b/tests/vmtests/test_reuse_raid_member.py
@@ -36,10 +36,6 @@ class JammyTestReuseRAIDMember(relbase.jammy, TestReuseRAIDMember):
     __test__ = True
 
 
-class ManticTestReuseRAIDMember(relbase.mantic, TestReuseRAIDMember):
-    __test__ = True
-
-
 class BionicTestReuseRAIDMemberPartition(relbase.bionic,
                                          TestReuseRAIDMemberPartition):
     __test__ = True
@@ -55,9 +51,4 @@ class JammyTestReuseRAIDMemberPartition(relbase.jammy,
     __test__ = True
 
 
-class ManticTestReuseRAIDMemberPartition(relbase.mantic,
-                                         TestReuseRAIDMemberPartition):
-    __test__ = True
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
index f2207b5..3116505 100644
--- a/tests/vmtests/test_reuse_uefi_esp.py
+++ b/tests/vmtests/test_reuse_uefi_esp.py
@@ -48,11 +48,4 @@ class JammyTestUefiReuseEsp(relbase.jammy, TestUefiReuseEspAbs):
         return super().test_efiboot_menu_has_one_distro_entry()
 
 
-class ManticTestUefiReuseEsp(relbase.mantic, TestUefiReuseEspAbs):
-    __test__ = True
-
-    def test_efiboot_menu_has_one_distro_entry(self):
-        return super().test_efiboot_menu_has_one_distro_entry()
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index be87f72..57010f5 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -54,13 +54,6 @@ class JammyTestSimple(relbase.jammy, TestSimple):
         self.output_files_exist(["netplan.yaml"])
 
 
-class ManticTestSimple(relbase.mantic, TestSimple):
-    __test__ = True
-
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
-
-
 class TestSimpleStorage(VMBaseClass):
     """ Test curtin runs clear-holders when mode=simple with storage cfg. """
     conf_file = "examples/tests/simple-storage.yaml"
@@ -117,13 +110,6 @@ class JammyTestSimpleStorage(relbase.jammy, TestSimpleStorage):
         self.output_files_exist(["netplan.yaml"])
 
 
-class ManticTestSimpleStorage(relbase.mantic, TestSimpleStorage):
-    __test__ = True
-
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
-
-
 class TestGrubNoDefaults(VMBaseClass):
     """ Test that curtin does not emit any grub configuration files. """
     conf_file = "examples/tests/no-grub-file.yaml"
@@ -157,11 +143,4 @@ class JammyTestGrubNoDefaults(relbase.jammy, TestGrubNoDefaults):
         self.output_files_exist(["netplan.yaml"])
 
 
-class ManticTestGrubNoDefaults(relbase.mantic, TestGrubNoDefaults):
-    __test__ = True
-
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
index 1eeae61..e962e09 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -104,10 +104,6 @@ class JammyUefiTestBasic(relbase.jammy, TestBasicAbs):
     __test__ = True
 
 
-class ManticUefiTestBasic(relbase.mantic, TestBasicAbs):
-    __test__ = True
-
-
 class Centos70UefiTestBasic4k(centos_relbase.centos70_xenial, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
@@ -133,9 +129,4 @@ class JammyUefiTestBasic4k(relbase.jammy, TestBasicAbs):
     disk_block_size = 4096
 
 
-class ManticUefiTestBasic4k(relbase.mantic, TestBasicAbs):
-    __test__ = True
-    disk_block_size = 4096
-
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index 1bb8fd3..1ea6ca0 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -106,11 +106,6 @@ class JammyTestZfsRoot(relbase.jammy, TestZfsRootAbs):
     mem = 4096
 
 
-class ManticTestZfsRoot(relbase.mantic, TestZfsRootAbs):
-    __test__ = True
-    mem = 4096
-
-
 class TestZfsRootFsTypeAbs(TestZfsRootAbs):
     conf_file = "examples/tests/basic-zfsroot.yaml"
 
@@ -140,9 +135,4 @@ class JammyTestZfsRootFsType(relbase.jammy, TestZfsRootFsTypeAbs):
     mem = 4096
 
 
-class ManticTestZfsRootFsType(relbase.mantic, TestZfsRootFsTypeAbs):
-    __test__ = True
-    mem = 4096
-
-
 # vi: ts=4 expandtab syntax=python