Merge ~raharper/curtin:fix/drop-disco-tests into curtin:master

[Ryan Harper]

vmtests: drop disco tests using a tool to automate the process

Remove disco tests, adding a new tool which can automate removal
of tests that match the release name.

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

PASSED: Continuous integration, rev:43d6d28cba94df66c63a3f265f799af716cfcc7c
https://jenkins.ubuntu.com/server/job/curtin-ci/3827/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3827/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3827/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3827/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3827/

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

review: Approve (continuous-integration)

[Dan Watkins (oddbloke)]

Test removal looks good and I like the script, but I do have a few inline comments on it.

review: Needs Fixing

[Chad Smith (chad.smith)]

A minor alternative for avoiding truncating a file beyond the last class definition.

review: Approve

[Chad Smith (chad.smith)]

Also, looks like we probably want to not attempt to rewrite the file if no modifications took place

Here's a paste that takes some of Dan's comments and mine

https://paste.ubuntu.com/p/pZgZBqhZNq/

00ba9f8... by Ryan Harper on 2020-02-03

tools/remove-vmtest-release: refactor and rename tool

Refactor remove-vmtest-release with the following changes:

- renamed to drop the trailing .py
- skip re-writing file if not modified
- ensure remaining content is not dropped after last class definition
  removed
- Add argparsing with parameters --distro-release, --path
- Handle single file or directory (--path tests/vmtests)
- Use distro.title() to capitalize the first letter of release
- Add comments in the parsing logic

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

PASSED: Continuous integration, rev:00ba9f8bce6778c873f9a599a69b348d6f4443f5
https://jenkins.ubuntu.com/server/job/curtin-ci/3830/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3830/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3830/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3830/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3830/

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

review: Approve (continuous-integration)

[Chad Smith (chad.smith)]

Approved and minor suggestion to drop one of the elif clauses

review: Approve

[Paride Legovini (paride)]

Thanks Ryan!

review: Approve

82b0be2... by Ryan Harper on 2020-02-04

remove-vmtest-release: remove 'class' match case, fix calling clean-file

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

PASSED: Continuous integration, rev:82b0be2881af3c6b77acd2ae055fa4508ea63d9e
https://jenkins.ubuntu.com/server/job/curtin-ci/3831/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3831/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3831/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3831/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3831/

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

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Removed elif clause, and fixed calling clean_file() function. Verified this removes what we expect and is idempotent.

diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 5cab556..91c05db 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -245,10 +245,6 @@ class BionicTestBasic(relbase.bionic, TestBasicAbs):
     __test__ = True
 
 
-class DiscoTestBasic(relbase.disco, TestBasicAbs):
-    __test__ = True
-
-
 class EoanTestBasic(relbase.eoan, TestBasicAbs):
     __test__ = True
 
@@ -352,10 +348,6 @@ class BionicTestScsiBasic(relbase.bionic, TestBasicScsiAbs):
     __test__ = True
 
 
-class DiscoTestScsiBasic(relbase.disco, TestBasicScsiAbs):
-    __test__ = True
-
-
 class EoanTestScsiBasic(relbase.eoan, TestBasicScsiAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
index 8079edd..391bafc 100644
--- a/tests/vmtests/test_basic_dasd.py
+++ b/tests/vmtests/test_basic_dasd.py
@@ -52,10 +52,6 @@ class BionicTestBasicDasd(relbase.bionic, TestBasicDasd):
     __test__ = True
 
 
-class DiscoTestBasicDasd(relbase.disco, TestBasicDasd):
-    __test__ = True
-
-
 class EoanTestBasicDasd(relbase.eoan, TestBasicDasd):
     __test__ = True
 
diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
index bf77381..54bac81 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -64,10 +64,6 @@ class BionicBcacheBasic(relbase.bionic, TestBcacheBasic):
     __test__ = True
 
 
-class DiscoBcacheBasic(relbase.disco, TestBcacheBasic):
-    __test__ = True
-
-
 class EoanBcacheBasic(relbase.eoan, TestBcacheBasic):
     __test__ = True
 
diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
index f4937ab..8c29046 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -19,10 +19,6 @@ class BionicTestBcacheBug1718699(relbase.bionic, TestBcacheBug1718699):
     __test__ = True
 
 
-class DiscoTestBcacheBug1718699(relbase.disco, TestBcacheBug1718699):
-    __test__ = True
-
-
 class EoanTestBcacheBug1718699(relbase.eoan, TestBcacheBug1718699):
     __test__ = True
 
diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
index f94a8b0..d24994a 100644
--- a/tests/vmtests/test_bcache_ceph.py
+++ b/tests/vmtests/test_bcache_ceph.py
@@ -75,10 +75,6 @@ class BionicTestBcacheCeph(relbase.bionic, TestBcacheCeph):
     __test__ = True
 
 
-class DiscoTestBcacheCeph(relbase.disco, TestBcacheCeph):
-    __test__ = True
-
-
 class EoanTestBcacheCeph(relbase.eoan, TestBcacheCeph):
     __test__ = True
 
diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
index faa23a0..f41e645 100644
--- a/tests/vmtests/test_bcache_partitions.py
+++ b/tests/vmtests/test_bcache_partitions.py
@@ -25,10 +25,6 @@ class BionicTestBcachePartitions(relbase.bionic, TestBcachePartitions):
     __test__ = True
 
 
-class DiscoTestBcachePartitions(relbase.disco, TestBcachePartitions):
-    __test__ = True
-
-
 class EoanTestBcachePartitions(relbase.eoan, TestBcachePartitions):
     __test__ = True
 
diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
index 58eb441..6c8cfc2 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -231,10 +231,6 @@ class BionicTestFsBattery(relbase.bionic, TestFsBattery):
     __test__ = True
 
 
-class DiscoTestFsBattery(relbase.disco, TestFsBattery):
-    __test__ = True
-
-
 class EoanTestFsBattery(relbase.eoan, TestFsBattery):
     __test__ = True
 
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index 227e96b..c99264c 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -72,10 +72,6 @@ class BionicTestIscsiBasic(relbase.bionic, TestBasicIscsiAbs):
     __test__ = True
 
 
-class DiscoTestIscsiBasic(relbase.disco, TestBasicIscsiAbs):
-    __test__ = True
-
-
 class EoanTestIscsiBasic(relbase.eoan, TestBasicIscsiAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
index de060d5..d29b4d4 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -32,10 +32,6 @@ class BionicTestJournaldReporter(relbase.bionic, TestJournaldReporter):
     __test__ = True
 
 
-class DiscoTestJournaldReporter(relbase.disco, TestJournaldReporter):
-    __test__ = True
-
-
 class EoanTestJournaldReporter(relbase.eoan, TestJournaldReporter):
     __test__ = True
 
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index 429b5c2..a79a705 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -77,10 +77,6 @@ class BionicTestLvm(relbase.bionic, TestLvmAbs):
     __test__ = True
 
 
-class DiscoTestLvm(relbase.disco, TestLvmAbs):
-    __test__ = True
-
-
 class EoanTestLvm(relbase.eoan, TestLvmAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
index 5578d22..6211d67 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -85,10 +85,6 @@ class BionicTestIscsiLvm(relbase.bionic, TestLvmIscsiAbs):
     __test__ = True
 
 
-class DiscoTestIscsiLvm(relbase.disco, TestLvmIscsiAbs):
-    __test__ = True
-
-
 class EoanTestIscsiLvm(relbase.eoan, TestLvmIscsiAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
index 24c2765..72c6180 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -51,10 +51,6 @@ class EoanTestLvmOverRaid(relbase.eoan, TestLvmOverRaidAbs):
     __test__ = True
 
 
-class DiscoTestLvmOverRaid(relbase.disco, TestLvmOverRaidAbs):
-    __test__ = True
-
-
 class BionicTestLvmOverRaid(relbase.bionic, TestLvmOverRaidAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 9819ebf..ea26393 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -151,10 +151,6 @@ class BionicTestMdadmBcache(relbase.bionic, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class DiscoTestMdadmBcache(relbase.disco, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
     __test__ = True
 
@@ -200,10 +196,6 @@ class BionicTestMirrorboot(relbase.bionic, TestMirrorbootAbs):
     __test__ = True
 
 
-class DiscoTestMirrorboot(relbase.disco, TestMirrorbootAbs):
-    __test__ = True
-
-
 class EoanTestMirrorboot(relbase.eoan, TestMirrorbootAbs):
     __test__ = True
 
@@ -252,11 +244,6 @@ class BionicTestMirrorbootPartitions(relbase.bionic,
     __test__ = True
 
 
-class DiscoTestMirrorbootPartitions(relbase.disco,
-                                    TestMirrorbootPartitionsAbs):
-    __test__ = True
-
-
 class EoanTestMirrorbootPartitions(relbase.eoan,
                                    TestMirrorbootPartitionsAbs):
     __test__ = True
@@ -315,11 +302,6 @@ class BionicTestMirrorbootPartitionsUEFI(relbase.bionic,
     __test__ = True
 
 
-class DiscoTestMirrorbootPartitionsUEFI(relbase.disco,
-                                        TestMirrorbootPartitionsUEFIAbs):
-    __test__ = True
-
-
 class EoanTestMirrorbootPartitionsUEFI(relbase.eoan,
                                        TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
@@ -367,10 +349,6 @@ class BionicTestRaid5boot(relbase.bionic, TestRaid5bootAbs):
     __test__ = True
 
 
-class DiscoTestRaid5boot(relbase.disco, TestRaid5bootAbs):
-    __test__ = True
-
-
 class EoanTestRaid5boot(relbase.eoan, TestRaid5bootAbs):
     __test__ = True
 
@@ -432,10 +410,6 @@ class BionicTestRaid6boot(relbase.bionic, TestRaid6bootAbs):
     __test__ = True
 
 
-class DiscoTestRaid6boot(relbase.disco, TestRaid6bootAbs):
-    __test__ = True
-
-
 class EoanTestRaid6boot(relbase.eoan, TestRaid6bootAbs):
     __test__ = True
 
@@ -483,10 +457,6 @@ class BionicTestRaid10boot(relbase.bionic, TestRaid10bootAbs):
     __test__ = True
 
 
-class DiscoTestRaid10boot(relbase.disco, TestRaid10bootAbs):
-    __test__ = True
-
-
 class EoanTestRaid10boot(relbase.eoan, TestRaid10bootAbs):
     __test__ = True
 
@@ -591,10 +561,6 @@ class BionicTestAllindata(relbase.bionic, TestAllindataAbs):
     __test__ = True
 
 
-class DiscoTestAllindata(relbase.disco, TestAllindataAbs):
-    __test__ = True
-
-
 class EoanTestAllindata(relbase.eoan, TestAllindataAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
index c0e6989..26b1f71 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -50,10 +50,6 @@ class BionicTestIscsiMdadm(relbase.bionic, TestMdadmIscsiAbs):
     __test__ = True
 
 
-class DiscoTestIscsiMdadm(relbase.disco, TestMdadmIscsiAbs):
-    __test__ = True
-
-
 class EoanTestIscsiMdadm(relbase.eoan, TestMdadmIscsiAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index c807a9b..b00303e 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -81,10 +81,6 @@ class BionicTestMultipathBasic(relbase.bionic, TestMultipathBasicAbs):
     __test__ = True
 
 
-class DiscoTestMultipathBasic(relbase.disco, TestMultipathBasicAbs):
-    __test__ = True
-
-
 class EoanTestMultipathBasic(relbase.eoan, TestMultipathBasicAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index f54e40a..601cad4 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -472,10 +472,6 @@ class BionicTestNetworkBasic(relbase.bionic, TestNetworkBasicAbs):
     __test__ = True
 
 
-class DiscoTestNetworkBasic(relbase.disco, TestNetworkBasicAbs):
-    __test__ = True
-
-
 class EoanTestNetworkBasic(relbase.eoan, TestNetworkBasicAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index 13c89ee..68e7de4 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -52,10 +52,6 @@ class BionicTestNetworkAlias(relbase.bionic, TestNetworkAliasAbs):
     __test__ = True
 
 
-class DiscoTestNetworkAlias(relbase.disco, TestNetworkAliasAbs):
-    __test__ = True
-
-
 class EoanTestNetworkAlias(relbase.eoan, TestNetworkAliasAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
index b808aec..913c7ff 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -57,10 +57,6 @@ class BionicTestBonding(relbase.bionic, TestNetworkBondingAbs):
     __test__ = True
 
 
-class DiscoTestBonding(relbase.disco, TestNetworkBondingAbs):
-    __test__ = True
-
-
 class EoanTestBonding(relbase.eoan, TestNetworkBondingAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index 3b5b99c..daaade5 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -236,10 +236,6 @@ class BionicTestBridging(relbase.bionic, TestBridgeNetworkAbs):
     __test__ = True
 
 
-class DiscoTestBridging(relbase.disco, TestBridgeNetworkAbs):
-    __test__ = True
-
-
 class EoanTestBridging(relbase.eoan, TestBridgeNetworkAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index e0a39a0..8f0dd54 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 DiscoTestNetworkIPV6(relbase.disco, TestNetworkIPV6Abs):
-    __test__ = True
-
-
 class EoanTestNetworkIPV6(relbase.eoan, TestNetworkIPV6Abs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index 278c837..8a1ba2f 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -23,10 +23,6 @@ class BionicTestNetworkIPV6Static(relbase.bionic, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
-class DiscoTestNetworkIPV6Static(relbase.disco, TestNetworkIPV6StaticAbs):
-    __test__ = True
-
-
 class EoanTestNetworkIPV6Static(relbase.eoan, TestNetworkIPV6StaticAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index f0f7389..709886f 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -22,10 +22,6 @@ class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
-class DiscoTestNetworkIPV6Vlan(relbase.disco, TestNetworkIPV6VlanAbs):
-    __test__ = True
-
-
 class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index e1a5565..bf13459 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -189,14 +189,6 @@ class BionicTestNetworkMtu(relbase.bionic, TestNetworkMtuAbs):
     upgrade_packages = "cloud-init,systemd"
 
 
-class DiscoTestNetworkMtu(relbase.disco, TestNetworkMtuAbs):
-    conf_file = "examples/tests/network_mtu_networkd.yaml"
-    __test__ = True
-    # Until systemd is released with the fix for LP:#1671951
-    add_repos = "ppa:ddstreet/systemd"
-    upgrade_packages = "cloud-init,systemd"
-
-
 class EoanTestNetworkMtu(relbase.eoan, TestNetworkMtuAbs):
     conf_file = "examples/tests/network_mtu_networkd.yaml"
     __test__ = True
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index b2fac16..80ff2cd 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -28,10 +28,6 @@ class BionicTestNetworkStatic(relbase.bionic, TestNetworkStaticAbs):
     __test__ = True
 
 
-class DiscoTestNetworkStatic(relbase.disco, TestNetworkStaticAbs):
-    __test__ = True
-
-
 class EoanTestNetworkStatic(relbase.eoan, TestNetworkStaticAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index 8e63df8..dfcbffe 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -28,11 +28,6 @@ class BionicTestNetworkStaticRoutes(relbase.bionic,
     __test__ = True
 
 
-class DiscoTestNetworkStaticRoutes(relbase.disco,
-                                   TestNetworkStaticRoutesAbs):
-    __test__ = True
-
-
 class EoanTestNetworkStaticRoutes(relbase.eoan,
                                   TestNetworkStaticRoutesAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 27aaa2b..b7c4e06 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -76,10 +76,6 @@ class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
     __test__ = True
 
 
-class DiscoTestNetworkVlan(relbase.disco, TestNetworkVlanAbs):
-    __test__ = True
-
-
 class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index 4f0b4d7..7c00829 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 DiscoTestNvme(relbase.disco, TestNvmeAbs):
-    __test__ = True
-
-
 class EoanTestNvme(relbase.eoan, TestNvmeAbs):
     __test__ = True
 
@@ -143,10 +139,6 @@ class BionicTestNvmeBcache(relbase.bionic, TestNvmeBcacheAbs):
     __test__ = True
 
 
-class DiscoTestNvmeBcache(relbase.disco, TestNvmeBcacheAbs):
-    __test__ = True
-
-
 class EoanTestNvmeBcache(relbase.eoan, TestNvmeBcacheAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
index 046fff5..ff21f20 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -61,10 +61,6 @@ class BionicTestPollinateUserAgent(relbase.bionic, TestPollinateUserAgent):
     __test__ = True
 
 
-class DiscoTestPollinateUserAgent(relbase.disco, TestPollinateUserAgent):
-    __test__ = True
-
-
 class EoanTestPollinateUserAgent(relbase.eoan, TestPollinateUserAgent):
     __test__ = True
 
diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
index 6194ab0..f02ba6c 100644
--- a/tests/vmtests/test_preserve.py
+++ b/tests/vmtests/test_preserve.py
@@ -25,10 +25,6 @@ class BionicTestPreserve(relbase.bionic, TestPreserve):
     __test__ = True
 
 
-class DiscoTestPreserve(relbase.disco, TestPreserve):
-    __test__ = True
-
-
 class EoanTestPreserve(relbase.eoan, TestPreserve):
     __test__ = True
 
diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
index 3168f57..cf3a6bb 100644
--- a/tests/vmtests/test_preserve_raid.py
+++ b/tests/vmtests/test_preserve_raid.py
@@ -25,10 +25,6 @@ class BionicTestPreserveRAID(relbase.bionic, TestPreserveRAID):
     __test__ = True
 
 
-class DiscoTestPreserveRAID(relbase.disco, TestPreserveRAID):
-    __test__ = True
-
-
 class EoanTestPreserveRAID(relbase.eoan, TestPreserveRAID):
     __test__ = True
 
diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
index a2df218..3d8937e 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -83,10 +83,6 @@ class BionicTestRaid5Bcache(relbase.bionic, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class DiscoTestRaid5Bcache(relbase.disco, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 class EoanTestRaid5Bcache(relbase.eoan, TestMdadmBcacheAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py
index af46a9b..0725966 100644
--- a/tests/vmtests/test_reuse_raid_member.py
+++ b/tests/vmtests/test_reuse_raid_member.py
@@ -28,10 +28,6 @@ class BionicTestReuseRAIDMember(relbase.bionic, TestReuseRAIDMember):
     __test__ = True
 
 
-class DiscoTestReuseRAIDMember(relbase.disco, TestReuseRAIDMember):
-    __test__ = True
-
-
 class EoanTestReuseRAIDMember(relbase.eoan, TestReuseRAIDMember):
     __test__ = True
 
@@ -45,11 +41,6 @@ class BionicTestReuseRAIDMemberPartition(relbase.bionic,
     __test__ = True
 
 
-class DiscoTestReuseRAIDMemberPartition(relbase.disco,
-                                        TestReuseRAIDMemberPartition):
-    __test__ = True
-
-
 class EoanTestReuseRAIDMemberPartition(relbase.eoan,
                                        TestReuseRAIDMemberPartition):
     __test__ = True
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index 9a21879..b34a6fc 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -49,13 +49,6 @@ class BionicTestSimple(relbase.bionic, TestSimple):
         self.output_files_exist(["netplan.yaml"])
 
 
-class DiscoTestSimple(relbase.disco, TestSimple):
-    __test__ = True
-
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
-
-
 class EoanTestSimple(relbase.eoan, TestSimple):
     __test__ = True
 
@@ -112,13 +105,6 @@ class BionicTestSimpleStorage(relbase.bionic, TestSimpleStorage):
         self.output_files_exist(["netplan.yaml"])
 
 
-class DiscoTestSimpleStorage(relbase.disco, TestSimpleStorage):
-    __test__ = True
-
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
-
-
 class EoanTestSimpleStorage(relbase.eoan, TestSimpleStorage):
     __test__ = True
 
diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
index a20506d..90940dd 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -105,10 +105,6 @@ class BionicUefiTestBasic(relbase.bionic, TestBasicAbs):
     __test__ = True
 
 
-class DiscoUefiTestBasic(relbase.disco, TestBasicAbs):
-    __test__ = True
-
-
 class EoanUefiTestBasic(relbase.eoan, TestBasicAbs):
     __test__ = True
 
@@ -132,11 +128,6 @@ class BionicUefiTestBasic4k(relbase.bionic, TestBasicAbs):
     disk_block_size = 4096
 
 
-class DiscoUefiTestBasic4k(relbase.disco, TestBasicAbs):
-    __test__ = True
-    disk_block_size = 4096
-
-
 class EoanUefiTestBasic4k(relbase.eoan, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index 86992c3..c9c73a3 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -96,11 +96,6 @@ class BionicTestZfsRoot(relbase.bionic, TestZfsRootAbs):
     __test__ = True
 
 
-class DiscoTestZfsRoot(relbase.disco, TestZfsRootAbs):
-    __test__ = True
-    mem = 4096
-
-
 class EoanTestZfsRoot(relbase.eoan, TestZfsRootAbs):
     __test__ = True
     mem = 4096
@@ -130,11 +125,6 @@ class BionicTestZfsRootFsType(relbase.bionic, TestZfsRootFsTypeAbs):
     __test__ = True
 
 
-class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):
-    __test__ = True
-    mem = 4096
-
-
 class EoanTestZfsRootFsType(relbase.eoan, TestZfsRootFsTypeAbs):
     __test__ = True
     mem = 4096
diff --git a/tools/remove-vmtest-release b/tools/remove-vmtest-release
new file mode 100644
index 0000000..8ab9b2e
--- /dev/null
+++ b/tools/remove-vmtest-release
@@ -0,0 +1,54 @@
+#!/usr/bin/python3
+
+import argparse
+import glob
+import os
+
+
+def clean_file(fname, distro):
+    new_content = []
+    modified = False
+    with open(fname, 'r') as fh:
+        delete = False
+        # using read().splitlines() to strip the newline char
+        for line in fh.read().splitlines():
+            if line.startswith('class %s' % distro):
+                delete = True
+            # ensure we don't remove final block of text outside
+            # of the distro test class definition scope.
+            # N.B: we match the empty line right before the next class scope
+            elif delete and line and not line[0].isspace():
+                delete = False
+
+            if delete:
+                modified = True
+                continue
+            else:
+                new_content.append(line)
+
+    # skip a re-write of content if no modifications
+    if modified:
+        cleaned_fn = fname
+        with open(cleaned_fn, 'w') as wfh:
+            wfh.write("\n".join(new_content) + '\n')
+        print("Wrote cleaned file: %s" % cleaned_fn)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        prog="remove-vmtest-release",
+        description="Tool to remove vmtest classes by distro release")
+    parser.add_argument('--distro-release', '-d',
+                        action='store', required=True)
+    parser.add_argument('--path', '-p', action='store', required=True)
+
+    args = parser.parse_args()
+    distro = args.distro_release.title()
+    target = args.path
+    if os.path.isdir(target):
+        files = glob.glob(os.path.normpath(target) + '/' + 'test_*.py')
+    else:
+        files = [target]
+
+    for fname in files:
+        clean_file(fname, distro)
diff --git a/tools/run-pep8 b/tools/run-pep8
index b1dd7c0..c27a96c 100755
--- a/tools/run-pep8
+++ b/tools/run-pep8
@@ -9,6 +9,7 @@ pycheck_dirs=(
     "tools/block-discover-to-config"
     "tools/curtin-log-print"
     "tools/noproxy"
+    "tools/remove-vmtest-release"
     "tools/schema-validate-storage"
     "tools/ssh-keys-list"
     "tools/vmtest-filter"
diff --git a/tools/run-pyflakes b/tools/run-pyflakes
index f9c2185..86eb3cc 100755
--- a/tools/run-pyflakes
+++ b/tools/run-pyflakes
@@ -17,6 +17,7 @@ pycheck_dirs=(
     "tools/block-discover-to-config"
     "tools/curtin-log-print"
     "tools/noproxy"
+    "tools/remove-vmtest-release"
     "tools/schema-validate-storage"
     "tools/ssh-keys-list"
     "tools/vmtest-filter"