Merge ~mwhudson/curtin:bye-groovy-hello-impish into curtin:master

[Michael Hudson-Doyle]

remove groovy and add impish to the vmtests

using tools/vmtest-add-relase, tools/vmtest-remove-release

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

FAILED: Continuous integration, rev:a13adc0554d866e56517e7ee7ebecf4727b6590a
https://jenkins.ubuntu.com/server/job/curtin-ci/143/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/143/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/143/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/143/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/143/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/143//rebuild

review: Needs Fixing (continuous-integration)

37ecd32... by Michael Hudson-Doyle on 2021-08-02

update tests/vmtests/release.py

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

FAILED: Continuous integration, rev:37ecd32922a6bf29594d93547ebd1a447257435e
https://jenkins.ubuntu.com/server/job/curtin-ci/144/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/144/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/144/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/144/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/144/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/144//rebuild

review: Needs Fixing (continuous-integration)

0b1924d... by Michael Hudson-Doyle on 2021-08-02

fix flakes

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

PASSED: Continuous integration, rev:0b1924de9ab6b1eb47bb665b0df28a995587c463
https://jenkins.ubuntu.com/server/job/curtin-ci/145/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/145/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/145/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/145/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/145/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/145//rebuild

review: Approve (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

Dan did this better.

Unmerged commits

0b1924d... by Michael Hudson-Doyle on 2021-08-02

fix flakes

37ecd32... by Michael Hudson-Doyle on 2021-08-02

update tests/vmtests/release.py

a13adc0... by Michael Hudson-Doyle on 2021-07-30

remove groovy and add impish to the vmtests

using tools/vmtest-add-relase, tools/vmtest-remove-release

diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index 35b069b..31c4827 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -185,20 +185,20 @@ class _FocalBase(_UbuntuBase):
         subarch = "ga-20.04"
 
 
-class _GroovyBase(_UbuntuBase):
-    release = "groovy"
-    target_release = "groovy"
+class _HirsuteBase(_UbuntuBase):
+    release = "hirsute"
+    target_release = "hirsute"
     mem = "2048"
     if _UbuntuBase.arch == "arm64":
         subarch = "ga-20.10"
 
 
-class _HirsuteBase(_UbuntuBase):
-    release = "hirsute"
-    target_release = "hirsute"
+class _ImpishBase(_UbuntuBase):
+    release = "impish"
+    target_release = "impish"
     mem = "2048"
     if _UbuntuBase.arch == "arm64":
-        subarch = "ga-20.10"
+        subarch = "ga-21.10"
 
 
 class _Releases(object):
@@ -219,8 +219,8 @@ class _Releases(object):
     disco = _DiscoBase
     eoan = _EoanBase
     focal = _FocalBase
-    groovy = _GroovyBase
     hirsute = _HirsuteBase
+    impish = _ImpishBase
 
 
 class _CentosReleases(object):
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index a95612c..2fdd971 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -72,7 +72,7 @@ class HirsuteTestAptConfigCMDCMD(relbase.hirsute, TestAptConfigCMD):
     __test__ = True
 
 
-class GroovyTestAptConfigCMDCMD(relbase.groovy, TestAptConfigCMD):
+class ImpishTestAptConfigCMDCMD(relbase.impish, TestAptConfigCMD):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 06f1f59..6059bd9 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -263,7 +263,7 @@ class HirsuteTestBasic(relbase.hirsute, TestBasicAbs):
     __test__ = True
 
 
-class GroovyTestBasic(relbase.groovy, TestBasicAbs):
+class ImpishTestBasic(relbase.impish, TestBasicAbs):
     __test__ = True
 
 
@@ -387,7 +387,7 @@ class HirsuteTestScsiBasic(relbase.hirsute, TestBasicScsiAbs):
     __test__ = True
 
 
-class GroovyTestScsiBasic(relbase.groovy, TestBasicScsiAbs):
+class ImpishTestScsiBasic(relbase.impish, TestBasicScsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
index 49957b8..0aa35fd 100644
--- a/tests/vmtests/test_basic_dasd.py
+++ b/tests/vmtests/test_basic_dasd.py
@@ -60,7 +60,7 @@ class HirsuteTestBasicDasd(relbase.hirsute, TestBasicDasd):
     __test__ = True
 
 
-class GroovyTestBasicDasd(relbase.groovy, TestBasicDasd):
+class ImpishTestBasicDasd(relbase.impish, TestBasicDasd):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
index e9ec1ea..490ae4c 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -72,7 +72,7 @@ class HirsuteBcacheBasic(relbase.hirsute, TestBcacheBasic):
     __test__ = True
 
 
-class GroovyBcacheBasic(relbase.groovy, TestBcacheBasic):
+class ImpishBcacheBasic(relbase.impish, TestBcacheBasic):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
index a43ec0f..3b19c41 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -27,7 +27,7 @@ class HirsuteTestBcacheBug1718699(relbase.hirsute, TestBcacheBug1718699):
     __test__ = True
 
 
-class GroovyTestBcacheBug1718699(relbase.groovy, TestBcacheBug1718699):
+class ImpishTestBcacheBug1718699(relbase.impish, TestBcacheBug1718699):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
index 53e050c..713ade9 100644
--- a/tests/vmtests/test_bcache_ceph.py
+++ b/tests/vmtests/test_bcache_ceph.py
@@ -83,7 +83,7 @@ class HirsuteTestBcacheCeph(relbase.hirsute, TestBcacheCeph):
     __test__ = True
 
 
-class GroovyTestBcacheCeph(relbase.groovy, TestBcacheCeph):
+class ImpishTestBcacheCeph(relbase.impish, TestBcacheCeph):
     __test__ = True
 
 
@@ -117,7 +117,7 @@ class HirsuteTestBcacheCephLvm(relbase.hirsute, TestBcacheCephLvm):
     __test__ = True
 
 
-class GroovyTestBcacheCephLvm(relbase.groovy, TestBcacheCephLvm):
+class ImpishTestBcacheCephLvm(relbase.impish, TestBcacheCephLvm):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
index a69d2ef..6268fd5 100644
--- a/tests/vmtests/test_bcache_partitions.py
+++ b/tests/vmtests/test_bcache_partitions.py
@@ -33,7 +33,7 @@ class HirsuteTestBcachePartitions(relbase.hirsute, TestBcachePartitions):
     __test__ = True
 
 
-class GroovyTestBcachePartitions(relbase.groovy, TestBcachePartitions):
+class ImpishTestBcachePartitions(relbase.impish, TestBcachePartitions):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
index cc39f4a..7d70f9c 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -247,7 +247,7 @@ class HirsuteTestFsBattery(relbase.hirsute, TestFsBattery):
     __test__ = True
 
 
-class GroovyTestFsBattery(relbase.groovy, TestFsBattery):
+class ImpishTestFsBattery(relbase.impish, TestFsBattery):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index c46ac30..2fd9866 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -80,7 +80,7 @@ class HirsuteTestIscsiBasic(relbase.hirsute, TestBasicIscsiAbs):
     __test__ = True
 
 
-class GroovyTestIscsiBasic(relbase.groovy, TestBasicIscsiAbs):
+class ImpishTestIscsiBasic(relbase.impish, TestBasicIscsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
index 3979aa7..064d71a 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -40,7 +40,7 @@ class HirsuteTestJournaldReporter(relbase.hirsute, TestJournaldReporter):
     __test__ = True
 
 
-class GroovyTestJournaldReporter(relbase.groovy, TestJournaldReporter):
+class ImpishTestJournaldReporter(relbase.impish, TestJournaldReporter):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index d169eeb..a0ce90d 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -85,7 +85,7 @@ class HirsuteTestLvm(relbase.hirsute, TestLvmAbs):
     __test__ = True
 
 
-class GroovyTestLvm(relbase.groovy, TestLvmAbs):
+class ImpishTestLvm(relbase.impish, TestLvmAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
index 0cf020e..463d863 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -103,7 +103,7 @@ class HirsuteTestIscsiLvm(relbase.hirsute, TestLvmIscsiAbs):
     __test__ = True
 
 
-class GroovyTestIscsiLvm(relbase.groovy, TestLvmIscsiAbs):
+class ImpishTestIscsiLvm(relbase.impish, TestLvmIscsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
index 3fe71a9..650fc25 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -63,5 +63,5 @@ class HirsuteTestLvmOverRaid(relbase.hirsute, TestLvmOverRaidAbs):
     __test__ = True
 
 
-class GroovyTestLvmOverRaid(relbase.groovy, TestLvmOverRaidAbs):
+class ImpishTestLvmOverRaid(relbase.impish, TestLvmOverRaidAbs):
     __test__ = True
diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
index c910160..bc09e8d 100644
--- a/tests/vmtests/test_lvm_root.py
+++ b/tests/vmtests/test_lvm_root.py
@@ -101,7 +101,7 @@ class HirsuteTestLvmRootExt4(relbase.hirsute, TestLvmRootAbs):
     }
 
 
-class GroovyTestLvmRootExt4(relbase.groovy, TestLvmRootAbs):
+class ImpishTestLvmRootExt4(relbase.impish, TestLvmRootAbs):
     __test__ = True
     conf_replace = {
         '__ROOTFS_FORMAT__': 'ext4',
@@ -162,7 +162,7 @@ class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs):
     }
 
 
-class GroovyTestUefiLvmRootExt4(relbase.groovy, TestUefiLvmRootAbs):
+class ImpishTestUefiLvmRootExt4(relbase.impish, 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 62f25e7..d90f478 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -162,7 +162,7 @@ class HirsuteTestMdadmBcache(relbase.hirsute, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class GroovyTestMdadmBcache(relbase.groovy, TestMdadmBcacheAbs):
+class ImpishTestMdadmBcache(relbase.impish, TestMdadmBcacheAbs):
     __test__ = True
 
 
@@ -211,7 +211,7 @@ class HirsuteTestMirrorboot(relbase.hirsute, TestMirrorbootAbs):
     __test__ = True
 
 
-class GroovyTestMirrorboot(relbase.groovy, TestMirrorbootAbs):
+class ImpishTestMirrorboot(relbase.impish, TestMirrorbootAbs):
     __test__ = True
 
 
@@ -265,7 +265,7 @@ class HirsuteTestMirrorbootPartitions(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestMirrorbootPartitions(relbase.groovy,
+class ImpishTestMirrorbootPartitions(relbase.impish,
                                      TestMirrorbootPartitionsAbs):
     __test__ = True
 
@@ -365,7 +365,7 @@ class HirsuteTestMirrorbootPartitionsUEFI(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestMirrorbootPartitionsUEFI(relbase.groovy,
+class ImpishTestMirrorbootPartitionsUEFI(relbase.impish,
                                          TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
 
@@ -418,7 +418,7 @@ class HirsuteTestRaid5boot(relbase.hirsute, TestRaid5bootAbs):
     __test__ = True
 
 
-class GroovyTestRaid5boot(relbase.groovy, TestRaid5bootAbs):
+class ImpishTestRaid5boot(relbase.impish, TestRaid5bootAbs):
     __test__ = True
 
 
@@ -483,7 +483,7 @@ class HirsuteTestRaid6boot(relbase.hirsute, TestRaid6bootAbs):
     __test__ = True
 
 
-class GroovyTestRaid6boot(relbase.groovy, TestRaid6bootAbs):
+class ImpishTestRaid6boot(relbase.impish, TestRaid6bootAbs):
     __test__ = True
 
 
@@ -534,7 +534,7 @@ class HirsuteTestRaid10boot(relbase.hirsute, TestRaid10bootAbs):
     __test__ = True
 
 
-class GroovyTestRaid10boot(relbase.groovy, TestRaid10bootAbs):
+class ImpishTestRaid10boot(relbase.impish, TestRaid10bootAbs):
     __test__ = True
 
 
@@ -642,7 +642,7 @@ class HirsuteTestAllindata(relbase.hirsute, TestAllindataAbs):
     __test__ = True
 
 
-class GroovyTestAllindata(relbase.groovy, TestAllindataAbs):
+class ImpishTestAllindata(relbase.impish, TestAllindataAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
index 6ad6b72..f6f0b22 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -58,7 +58,7 @@ class HirsuteTestIscsiMdadm(relbase.hirsute, TestMdadmIscsiAbs):
     __test__ = True
 
 
-class GroovyTestIscsiMdadm(relbase.groovy, TestMdadmIscsiAbs):
+class ImpishTestIscsiMdadm(relbase.impish, TestMdadmIscsiAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index 163b73a..ac85a58 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -166,7 +166,7 @@ class HirsuteTestMultipathBasic(relbase.hirsute, TestMultipathBasicAbs):
     __test__ = True
 
 
-class GroovyTestMultipathBasic(relbase.groovy, TestMultipathBasicAbs):
+class ImpishTestMultipathBasic(relbase.impish, TestMultipathBasicAbs):
     __test__ = True
 
 
@@ -182,7 +182,7 @@ class HirsuteTestMultipathReuse(relbase.hirsute, TestMultipathReuseAbs):
     __test__ = True
 
 
-class GroovyTestMultipathReuse(relbase.groovy, TestMultipathReuseAbs):
+class ImpishTestMultipathReuse(relbase.impish, TestMultipathReuseAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py
index f5f5537..97d797e 100644
--- a/tests/vmtests/test_multipath_lvm.py
+++ b/tests/vmtests/test_multipath_lvm.py
@@ -64,7 +64,7 @@ class HirsuteTestMultipathLvm(relbase.hirsute, TestMultipathLvmAbs):
     __test__ = True
 
 
-class GroovyTestMultipathLvm(relbase.groovy, TestMultipathLvmAbs):
+class ImpishTestMultipathLvm(relbase.impish, TestMultipathLvmAbs):
     __test__ = True
 
 
@@ -82,7 +82,7 @@ class HirsuteTestMultipathLvmPartWipe(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestMultipathLvmPartWipe(relbase.groovy,
+class ImpishTestMultipathLvmPartWipe(relbase.impish,
                                      TestMultipathLvmPartWipeAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index db16bd4..1b42493 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -482,7 +482,7 @@ class HirsuteTestNetworkBasic(relbase.hirsute, TestNetworkBasicAbs):
     __test__ = True
 
 
-class GroovyTestNetworkBasic(relbase.groovy, TestNetworkBasicAbs):
+class ImpishTestNetworkBasic(relbase.impish, TestNetworkBasicAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index 9f460fa..8b58edd 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -60,7 +60,7 @@ class HirsuteTestNetworkAlias(relbase.hirsute, TestNetworkAliasAbs):
     __test__ = True
 
 
-class GroovyTestNetworkAlias(relbase.groovy, TestNetworkAliasAbs):
+class ImpishTestNetworkAlias(relbase.impish, TestNetworkAliasAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
index f58065d..73bcf60 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -65,7 +65,7 @@ class HirsuteTestBonding(relbase.hirsute, TestNetworkBondingAbs):
     __test__ = True
 
 
-class GroovyTestBonding(relbase.groovy, TestNetworkBondingAbs):
+class ImpishTestBonding(relbase.impish, TestNetworkBondingAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index b0d5962..93ecc4b 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -244,7 +244,7 @@ class HirsuteTestBridging(relbase.hirsute, TestBridgeNetworkAbs):
     __test__ = True
 
 
-class GroovyTestBridging(relbase.groovy, TestBridgeNetworkAbs):
+class ImpishTestBridging(relbase.impish, TestBridgeNetworkAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py
index 9079f8e..d56ebde 100644
--- a/tests/vmtests/test_network_disabled.py
+++ b/tests/vmtests/test_network_disabled.py
@@ -67,7 +67,7 @@ class HirsuteCurtinDisableNetworkRendering(relbase.hirsute, TestKlass1):
     __test__ = True
 
 
-class GroovyCurtinDisableNetworkRendering(relbase.groovy, TestKlass1):
+class ImpishCurtinDisableNetworkRendering(relbase.impish, TestKlass1):
     __test__ = True
 
 
@@ -79,7 +79,7 @@ class HirsuteCurtinDisableCloudInitNetworking(relbase.hirsute, TestKlass2):
     __test__ = True
 
 
-class GroovyCurtinDisableCloudInitNetworking(relbase.groovy, TestKlass2):
+class ImpishCurtinDisableCloudInitNetworking(relbase.impish, TestKlass2):
     __test__ = True
 
 
@@ -92,7 +92,7 @@ class HirsuteCurtinDisableCloudInitNetworkingVersion1(relbase.hirsute,
     __test__ = True
 
 
-class GroovyCurtinDisableCloudInitNetworkingVersion1(relbase.groovy,
+class ImpishCurtinDisableCloudInitNetworkingVersion1(relbase.impish,
                                                      TestKlass3):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index d76d295..7802855 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -53,10 +53,6 @@ class BionicTestNetworkIPV6(relbase.bionic, TestNetworkIPV6Abs):
     __test__ = True
 
 
-class GroovyTestNetworkIPV6(relbase.groovy, TestNetworkIPV6Abs):
-    __test__ = True
-
-
 class Centos66TestNetworkIPV6(centos_relbase.centos66_xenial,
                               CentosTestNetworkIPV6Abs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index c3e5b5a..f24aab5 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -31,7 +31,7 @@ class HirsuteTestNetworkIPV6Static(relbase.hirsute, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
-class GroovyTestNetworkIPV6Static(relbase.groovy, TestNetworkIPV6StaticAbs):
+class ImpishTestNetworkIPV6Static(relbase.impish, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 96c056b..a6eae41 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -30,7 +30,7 @@ class HirsuteTestNetworkIPV6Vlan(relbase.hirsute, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
-class GroovyTestNetworkIPV6Vlan(relbase.groovy, TestNetworkIPV6VlanAbs):
+class ImpishTestNetworkIPV6Vlan(relbase.impish, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index 8e6e57c..a36a752 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -197,7 +197,7 @@ class HirsuteTestNetworkMtu(relbase.hirsute, TestNetworkMtuNetworkdAbs):
     __test__ = True
 
 
-class GroovyTestNetworkMtu(relbase.groovy, TestNetworkMtuNetworkdAbs):
+class ImpishTestNetworkMtu(relbase.impish, TestNetworkMtuNetworkdAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py
index a32d637..3e8699d 100644
--- a/tests/vmtests/test_network_ovs.py
+++ b/tests/vmtests/test_network_ovs.py
@@ -42,7 +42,8 @@ class HirsuteTestNetworkOvs(relbase.hirsute, TestNetworkOvsAbs):
     __test__ = True
 
 
-class GroovyTestNetworkOvs(relbase.groovy, TestNetworkOvsAbs):
+class ImpishTestNetworkOvs(relbase.impish, 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 abcbb75..95960af 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -36,7 +36,7 @@ class HirsuteTestNetworkStatic(relbase.hirsute, TestNetworkStaticAbs):
     __test__ = True
 
 
-class GroovyTestNetworkStatic(relbase.groovy, TestNetworkStaticAbs):
+class ImpishTestNetworkStatic(relbase.impish, TestNetworkStaticAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index e158f9a..eb096ee 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -38,7 +38,7 @@ class HirsuteTestNetworkStaticRoutes(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestNetworkStaticRoutes(relbase.groovy,
+class ImpishTestNetworkStaticRoutes(relbase.impish,
                                     TestNetworkStaticRoutesAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index af52af0..1f78cfa 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -90,9 +90,12 @@ class HirsuteTestNetworkVlan(relbase.hirsute, TestNetworkVlanAbs):
         return super().test_ip_output()
 
 
-class GroovyTestNetworkVlan(relbase.groovy, TestNetworkVlanAbs):
+class ImpishTestNetworkVlan(relbase.impish, TestNetworkVlanAbs):
     __test__ = True
 
+    def test_ip_output(self):
+        return super().test_ip_output()
+
 
 class Centos66TestNetworkVlan(centos_relbase.centos66_xenial,
                               CentosTestNetworkVlanAbs):
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index 9531a80..01f5a54 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -73,10 +73,6 @@ class BionicTestNvme(relbase.bionic, TestNvmeAbs):
     __test__ = True
 
 
-class GroovyTestNvme(relbase.groovy, TestNvmeAbs):
-    __test__ = True
-
-
 class TestNvmeBcacheAbs(TestNvmeAbs):
     arch_skip = [
         "s390x",  # nvme is a pci device, no pci on s390x
@@ -147,7 +143,7 @@ class HirsuteTestNvmeBcache(relbase.hirsute, TestNvmeBcacheAbs):
     __test__ = True
 
 
-class GroovyTestNvmeBcache(relbase.groovy, TestNvmeBcacheAbs):
+class ImpishTestNvmeBcache(relbase.impish, TestNvmeBcacheAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py
index e841f2a..a5533f9 100644
--- a/tests/vmtests/test_panic.py
+++ b/tests/vmtests/test_panic.py
@@ -33,7 +33,7 @@ class HirsuteTestInstallPanic(relbase.hirsute, TestInstallPanic):
     __test__ = True
 
 
-class GroovyTestInstallPanic(relbase.groovy, TestInstallPanic):
+class ImpishTestInstallPanic(relbase.impish, TestInstallPanic):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
index 4aeefd8..fa33ec5 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -69,7 +69,7 @@ class HirsuteTestPollinateUserAgent(relbase.hirsute, TestPollinateUserAgent):
     __test__ = True
 
 
-class GroovyTestPollinateUserAgent(relbase.groovy, TestPollinateUserAgent):
+class ImpishTestPollinateUserAgent(relbase.impish, TestPollinateUserAgent):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
index 28dd34f..74fe29e 100644
--- a/tests/vmtests/test_preserve.py
+++ b/tests/vmtests/test_preserve.py
@@ -33,7 +33,7 @@ class HirsuteTestPreserve(relbase.hirsute, TestPreserve):
     __test__ = True
 
 
-class GroovyTestPreserve(relbase.groovy, TestPreserve):
+class ImpishTestPreserve(relbase.impish, TestPreserve):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py
index 2e6b412..46edd3f 100644
--- a/tests/vmtests/test_preserve_bcache.py
+++ b/tests/vmtests/test_preserve_bcache.py
@@ -64,7 +64,7 @@ class HirsuteTestPreserveBcache(relbase.hirsute, TestPreserveBcache):
     __test__ = True
 
 
-class GroovyTestPreserveBcache(relbase.groovy, TestPreserveBcache):
+class ImpishTestPreserveBcache(relbase.impish, TestPreserveBcache):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py
index 274e9c6..0c09c11 100644
--- a/tests/vmtests/test_preserve_lvm.py
+++ b/tests/vmtests/test_preserve_lvm.py
@@ -77,7 +77,7 @@ class HirsuteTestLvmPreserve(relbase.hirsute, TestLvmPreserveAbs):
     __test__ = True
 
 
-class GroovyTestLvmPreserve(relbase.groovy, TestLvmPreserveAbs):
+class ImpishTestLvmPreserve(relbase.impish, TestLvmPreserveAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py
index 2469615..4db6c2b 100644
--- a/tests/vmtests/test_preserve_partition_wipe_vg.py
+++ b/tests/vmtests/test_preserve_partition_wipe_vg.py
@@ -33,7 +33,7 @@ class HirsuteTestPreserveWipeLvm(relbase.hirsute, TestPreserveWipeLvm):
     __test__ = True
 
 
-class GroovyTestPreserveWipeLvm(relbase.groovy, TestPreserveWipeLvm):
+class ImpishTestPreserveWipeLvm(relbase.impish, TestPreserveWipeLvm):
     __test__ = True
 
 
@@ -61,7 +61,7 @@ class HirsuteTestPreserveWipeLvmSimple(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestPreserveWipeLvmSimple(relbase.groovy,
+class ImpishTestPreserveWipeLvmSimple(relbase.impish,
                                       TestPreserveWipeLvmSimple):
     __test__ = True
 
diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
index 8c85a20..4bb977e 100644
--- a/tests/vmtests/test_preserve_raid.py
+++ b/tests/vmtests/test_preserve_raid.py
@@ -33,7 +33,7 @@ class HirsuteTestPreserveRAID(relbase.hirsute, TestPreserveRAID):
     __test__ = True
 
 
-class GroovyTestPreserveRAID(relbase.groovy, TestPreserveRAID):
+class ImpishTestPreserveRAID(relbase.impish, TestPreserveRAID):
     __test__ = True
 
 
@@ -67,8 +67,8 @@ class HirsuteTestPartitionExistingRAID(
     __test__ = True
 
 
-class GroovyTestPartitionExistingRAID(
-        relbase.groovy, TestPartitionExistingRAID):
+class ImpishTestPartitionExistingRAID(
+        relbase.impish, TestPartitionExistingRAID):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
index 493c0fd..e682f34 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -96,7 +96,7 @@ class HirsuteTestRaid5Bcache(relbase.hirsute, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class GroovyTestRaid5Bcache(relbase.groovy, TestMdadmBcacheAbs):
+class ImpishTestRaid5Bcache(relbase.impish, TestMdadmBcacheAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py
index aaa73f2..a2bd1be 100644
--- a/tests/vmtests/test_raid_partition_to_disk.py
+++ b/tests/vmtests/test_raid_partition_to_disk.py
@@ -26,7 +26,7 @@ class HirsuteTestRAIDPartitionToDisk(relbase.hirsute, TestRAIDPartitionToDisk):
     __test__ = True
 
 
-class GroovyTestRAIDPartitionToDisk(relbase.groovy, TestRAIDPartitionToDisk):
+class ImpishTestRAIDPartitionToDisk(relbase.impish, TestRAIDPartitionToDisk):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py
index eba3d1b..81c0cb0 100644
--- a/tests/vmtests/test_reuse_lvm_member.py
+++ b/tests/vmtests/test_reuse_lvm_member.py
@@ -31,7 +31,7 @@ class HirsuteTestReuseLVMMemberPartition(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestReuseLVMMemberPartition(relbase.groovy,
+class ImpishTestReuseLVMMemberPartition(relbase.impish,
                                         TestReuseLVMMemberPartition):
     __test__ = True
 
diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py
index 77431bf..ed52f5b 100644
--- a/tests/vmtests/test_reuse_msdos_partitions.py
+++ b/tests/vmtests/test_reuse_msdos_partitions.py
@@ -28,7 +28,7 @@ class HirsuteTestReuseMSDOSPartitions(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestReuseMSDOSPartitions(relbase.groovy,
+class ImpishTestReuseMSDOSPartitions(relbase.impish,
                                      TestReuseMSDOSPartitions):
     __test__ = True
 
diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py
index e3723e8..7611140 100644
--- a/tests/vmtests/test_reuse_raid_member.py
+++ b/tests/vmtests/test_reuse_raid_member.py
@@ -36,7 +36,7 @@ class HirsuteTestReuseRAIDMember(relbase.hirsute, TestReuseRAIDMember):
     __test__ = True
 
 
-class GroovyTestReuseRAIDMember(relbase.groovy, TestReuseRAIDMember):
+class ImpishTestReuseRAIDMember(relbase.impish, TestReuseRAIDMember):
     __test__ = True
 
 
@@ -55,7 +55,7 @@ class HirsuteTestReuseRAIDMemberPartition(relbase.hirsute,
     __test__ = True
 
 
-class GroovyTestReuseRAIDMemberPartition(relbase.groovy,
+class ImpishTestReuseRAIDMemberPartition(relbase.impish,
                                          TestReuseRAIDMemberPartition):
     __test__ = True
 
diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
index 46f3a57..958e43f 100644
--- a/tests/vmtests/test_reuse_uefi_esp.py
+++ b/tests/vmtests/test_reuse_uefi_esp.py
@@ -49,7 +49,7 @@ class HirsuteTestUefiReuseEsp(relbase.hirsute, TestUefiReuseEspAbs):
         return super().test_efiboot_menu_has_one_distro_entry()
 
 
-class GroovyTestUefiReuseEsp(relbase.groovy, TestUefiReuseEspAbs):
+class ImpishTestUefiReuseEsp(relbase.impish, 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 83dca96..0ee87fc 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -63,7 +63,7 @@ class HirsuteTestSimple(relbase.hirsute, TestSimple):
         self.output_files_exist(["netplan.yaml"])
 
 
-class GroovyTestSimple(relbase.groovy, TestSimple):
+class ImpishTestSimple(relbase.impish, TestSimple):
     __test__ = True
 
     def test_output_files_exist(self):
@@ -126,7 +126,7 @@ class HirsuteTestSimpleStorage(relbase.hirsute, TestSimpleStorage):
         self.output_files_exist(["netplan.yaml"])
 
 
-class GroovyTestSimpleStorage(relbase.groovy, TestSimpleStorage):
+class ImpishTestSimpleStorage(relbase.impish, TestSimpleStorage):
     __test__ = True
 
     def test_output_files_exist(self):
@@ -166,7 +166,7 @@ class HirsuteTestGrubNoDefaults(relbase.hirsute, TestGrubNoDefaults):
         self.output_files_exist(["netplan.yaml"])
 
 
-class GroovyTestGrubNoDefaults(relbase.groovy, TestGrubNoDefaults):
+class ImpishTestGrubNoDefaults(relbase.impish, 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 0ed4fab..aa4c650 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -118,7 +118,7 @@ class HirsuteUefiTestBasic(relbase.hirsute, TestBasicAbs):
     __test__ = True
 
 
-class GroovyUefiTestBasic(relbase.groovy, TestBasicAbs):
+class ImpishUefiTestBasic(relbase.impish, TestBasicAbs):
     __test__ = True
 
 
@@ -147,7 +147,7 @@ class HirsuteUefiTestBasic4k(relbase.hirsute, TestBasicAbs):
     disk_block_size = 4096
 
 
-class GroovyUefiTestBasic4k(relbase.groovy, TestBasicAbs):
+class ImpishUefiTestBasic4k(relbase.impish, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
 
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index 21e33b6..0e310c6 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -106,7 +106,7 @@ class HirsuteTestZfsRoot(relbase.hirsute, TestZfsRootAbs):
     mem = 4096
 
 
-class GroovyTestZfsRoot(relbase.groovy, TestZfsRootAbs):
+class ImpishTestZfsRoot(relbase.impish, TestZfsRootAbs):
     __test__ = True
     mem = 4096
 
@@ -140,7 +140,9 @@ class HirsuteTestZfsRootFsType(relbase.hirsute, TestZfsRootFsTypeAbs):
     mem = 4096
 
 
-class GroovyTestZfsRootFsType(relbase.groovy, TestZfsRootFsTypeAbs):
+class ImpishTestZfsRootFsType(relbase.impish, TestZfsRootFsTypeAbs):
     __test__ = True
+    mem = 4096
+
 
 # vi: ts=4 expandtab syntax=python