Merge ~raharper/curtin:feature/add-focal into curtin:master

[Ryan Harper]

vmtests: Add Focal Fossa

- Add the new release
- Switch some old Cosmic cases to Disco
- Add CentosXXFromFocal relbase
- Bump Skip-by dates for lvmroot, MTU and VLAN issues

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

FAILED: Continuous integration, rev:6f83e0c43e8dfcfeb4a57b72681c8fb2cb33a823
https://jenkins.ubuntu.com/server/job/curtin-ci/3788/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3788/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3788/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3788/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3788/

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

review: Needs Fixing (continuous-integration)

37ff035... by Ryan Harper on 2019-11-15

Focal systemd still pads vlan mtu by 4 bytes, skip it

[Dan Watkins (oddbloke)]

Qs inline

review: Needs Information

[Ryan Harper (raharper)]

Thanks Dan,

I'll update with some fixes.

17c3e1d... by Ryan Harper on 2019-11-19

Fix tox

1a5c276... by Ryan Harper on 2019-11-20

Add a netplan.yaml check back into dasd test

7fa766f... by Ryan Harper on 2019-11-20

fix style whitespace

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

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

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

review: Approve (continuous-integration)

[Paride Legovini (paride)]

Looks good!

review: Approve

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

00bd9b1... by Ryan Harper on 2019-12-12

Move skip_by date for vlan bug out since we're already past the date and it's not fixed

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index df2863f..bf8be2f 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -45,6 +45,13 @@ class _Centos70FromBionicBase(_CentosFromUbuntuBase):
     target_release = "centos70"
 
 
+class _Centos70FromFocalBase(_CentosFromUbuntuBase):
+    # release for boot
+    release = "focal"
+    # release for target
+    target_release = "centos70"
+
+
 class _UbuntuCore16FromXenialBase(_UbuntuCoreUbuntuBase):
     # release for boot
     release = "xenial"
@@ -63,6 +70,11 @@ class _Centos66FromBionicBase(_CentosFromUbuntuBase):
     target_release = "centos66"
 
 
+class _Centos66FromFocalBase(_CentosFromUbuntuBase):
+    release = "focal"
+    target_release = "centos66"
+
+
 class _PreciseBase(_UbuntuBase):
     release = "xenial"
     target_release = "precise"
@@ -150,6 +162,14 @@ class _EoanBase(_UbuntuBase):
         subarch = "ga-19.10"
 
 
+class _FocalBase(_UbuntuBase):
+    release = "focal"
+    target_release = "focal"
+    mem = "2048"
+    if _UbuntuBase.arch == "arm64":
+        subarch = "ga-20.04"
+
+
 class _Releases(object):
     trusty = _TrustyBase
     precise = _PreciseBase
@@ -167,6 +187,7 @@ class _Releases(object):
     cosmic = _CosmicBase
     disco = _DiscoBase
     eoan = _EoanBase
+    focal = _FocalBase
 
 
 class _CentosReleases(object):
@@ -174,6 +195,8 @@ class _CentosReleases(object):
     centos66_xenial = _Centos66FromXenialBase
     centos70_bionic = _Centos70FromBionicBase
     centos66_bionic = _Centos66FromBionicBase
+    centos70_focal = _Centos70FromFocalBase
+    centos66_focal = _Centos66FromFocalBase
 
 
 class _UbuntuCoreReleases(object):
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index 55677d9..4e43882 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -64,11 +64,8 @@ class BionicTestAptConfigCMDCMD(relbase.bionic, TestAptConfigCMD):
     __test__ = True
 
 
-class DiscoTestAptConfigCMDCMD(relbase.disco, TestAptConfigCMD):
+class FocalTestAptConfigCMDCMD(relbase.focal, TestAptConfigCMD):
     __test__ = True
 
 
-class EoanTestAptConfigCMDCMD(relbase.eoan, TestAptConfigCMD):
-    __test__ = True
-
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 8895a5e..c15fe8c 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -260,6 +260,11 @@ class Centos70BionicTestBasic(centos_relbase.centos70_bionic,
     __test__ = True
 
 
+class Centos70FocalTestBasic(centos_relbase.centos70_focal,
+                             CentosTestBasicAbs):
+    __test__ = True
+
+
 class Centos66XenialTestBasic(centos_relbase.centos66_xenial,
                               CentosTestBasicAbs):
     __test__ = True
@@ -303,6 +308,10 @@ class EoanTestBasic(relbase.eoan, TestBasicAbs):
     __test__ = True
 
 
+class FocalTestBasic(relbase.focal, TestBasicAbs):
+    __test__ = True
+
+
 class TestBasicScsiAbs(TestBasicAbs):
     conf_file = "examples/tests/basic_scsi.yaml"
     disk_driver = 'scsi-hd'
@@ -388,6 +397,16 @@ class Centos70XenialTestScsiBasic(centos_relbase.centos70_xenial,
     __test__ = True
 
 
+class Centos70BionicTestScsiBasic(centos_relbase.centos70_bionic,
+                                  TestBasicScsiAbs, CentosTestBasicAbs):
+    __test__ = True
+
+
+class Centos70FocalTestScsiBasic(centos_relbase.centos70_focal,
+                                 TestBasicScsiAbs, CentosTestBasicAbs):
+    __test__ = True
+
+
 class XenialGATestScsiBasic(relbase.xenial_ga, TestBasicScsiAbs):
     __test__ = True
 
@@ -411,4 +430,9 @@ class DiscoTestScsiBasic(relbase.disco, TestBasicScsiAbs):
 class EoanTestScsiBasic(relbase.eoan, TestBasicScsiAbs):
     __test__ = True
 
+
+class FocalTestScsiBasic(relbase.focal, 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 9b200e2..8079edd 100644
--- a/tests/vmtests/test_basic_dasd.py
+++ b/tests/vmtests/test_basic_dasd.py
@@ -38,8 +38,10 @@ class TestBasicDasd(VMBaseClass):
         """)]
 
     def test_output_files_exist(self):
-        self.output_files_exist(["sfdisk_list", "blkid",
-                                 "proc_partitions"])
+        files_to_check = ["sfdisk_list", "blkid", "proc_partitions"]
+        if self.target_release != "xenial":
+            files_to_check.append('netplan.yaml')
+        self.output_files_exist(files_to_check)
 
 
 class XenialGATestBasicDasd(relbase.xenial, TestBasicDasd):
@@ -49,21 +51,17 @@ class XenialGATestBasicDasd(relbase.xenial, TestBasicDasd):
 class BionicTestBasicDasd(relbase.bionic, TestBasicDasd):
     __test__ = True
 
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
-
 
 class DiscoTestBasicDasd(relbase.disco, TestBasicDasd):
     __test__ = True
 
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
-
 
 class EoanTestBasicDasd(relbase.eoan, TestBasicDasd):
     __test__ = True
 
-    def test_output_files_exist(self):
-        self.output_files_exist(["netplan.yaml"])
+
+class FocalTestBasicDasd(relbase.focal, 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 a8ce1fd..bf77381 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -71,4 +71,9 @@ class DiscoBcacheBasic(relbase.disco, TestBcacheBasic):
 class EoanBcacheBasic(relbase.eoan, TestBcacheBasic):
     __test__ = True
 
+
+class FocalBcacheBasic(relbase.focal, 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 b42a943..f4937ab 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -26,4 +26,9 @@ class DiscoTestBcacheBug1718699(relbase.disco, TestBcacheBug1718699):
 class EoanTestBcacheBug1718699(relbase.eoan, TestBcacheBug1718699):
     __test__ = True
 
+
+class FocalTestBcacheBug1718699(relbase.focal, 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 07d9bca..f94a8b0 100644
--- a/tests/vmtests/test_bcache_ceph.py
+++ b/tests/vmtests/test_bcache_ceph.py
@@ -83,6 +83,10 @@ class EoanTestBcacheCeph(relbase.eoan, TestBcacheCeph):
     __test__ = True
 
 
+class FocalTestBcacheCeph(relbase.focal, TestBcacheCeph):
+    __test__ = True
+
+
 class TestBcacheCephLvm(TestBcacheCeph):
     test_type = 'storage'
     nr_cpus = 2
@@ -105,4 +109,8 @@ class BionicTestBcacheCephLvm(relbase.bionic, TestBcacheCephLvm):
     __test__ = True
 
 
+class FocalTestBcacheCephLvm(relbase.focal, 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 161ca07..faa23a0 100644
--- a/tests/vmtests/test_bcache_partitions.py
+++ b/tests/vmtests/test_bcache_partitions.py
@@ -32,4 +32,9 @@ class DiscoTestBcachePartitions(relbase.disco, TestBcachePartitions):
 class EoanTestBcachePartitions(relbase.eoan, TestBcachePartitions):
     __test__ = True
 
+
+class FocalTestBcachePartitions(relbase.focal, 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 9b16fe9..58eb441 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -238,4 +238,9 @@ class DiscoTestFsBattery(relbase.disco, TestFsBattery):
 class EoanTestFsBattery(relbase.eoan, TestFsBattery):
     __test__ = True
 
+
+class FocalTestFsBattery(relbase.focal, TestFsBattery):
+    __test__ = True
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index e8bcb46..c47f100 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -78,4 +78,9 @@ class DiscoTestIscsiBasic(relbase.disco, TestBasicIscsiAbs):
 class EoanTestIscsiBasic(relbase.eoan, TestBasicIscsiAbs):
     __test__ = True
 
+
+class FocalTestIscsiBasic(relbase.focal, 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 36e3fb0..de060d5 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -28,10 +28,6 @@ class TestJournaldReporter(VMBaseClass):
             self.assertIn(key, e1)
 
 
-class XenialTestJournaldReporter(relbase.xenial, TestJournaldReporter):
-    __test__ = True
-
-
 class BionicTestJournaldReporter(relbase.bionic, TestJournaldReporter):
     __test__ = True
 
@@ -43,4 +39,9 @@ class DiscoTestJournaldReporter(relbase.disco, TestJournaldReporter):
 class EoanTestJournaldReporter(relbase.eoan, TestJournaldReporter):
     __test__ = True
 
+
+class FocalTestJournaldReporter(relbase.focal, TestJournaldReporter):
+    __test__ = True
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index e95d767..9a48b43 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -92,4 +92,9 @@ class DiscoTestLvm(relbase.disco, TestLvmAbs):
 class EoanTestLvm(relbase.eoan, TestLvmAbs):
     __test__ = True
 
+
+class FocalTestLvm(relbase.focal, 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 96f78b6..5578d22 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -92,4 +92,9 @@ class DiscoTestIscsiLvm(relbase.disco, TestLvmIscsiAbs):
 class EoanTestIscsiLvm(relbase.eoan, TestLvmIscsiAbs):
     __test__ = True
 
+
+class FocalTestIscsiLvm(relbase.focal, 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 c0ac6e8..24c2765 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -43,6 +43,10 @@ class TestLvmOverRaidAbs(TestMdadmAbs, TestLvmAbs):
         return self._test_pvs(dname_to_vg)
 
 
+class FocalTestLvmOverRaid(relbase.focal, TestLvmOverRaidAbs):
+    __test__ = True
+
+
 class EoanTestLvmOverRaid(relbase.eoan, TestLvmOverRaidAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
index 33deeac..e49a18c 100644
--- a/tests/vmtests/test_lvm_root.py
+++ b/tests/vmtests/test_lvm_root.py
@@ -84,6 +84,13 @@ class XenialTestLvmRootExt4(relbase.xenial, TestLvmRootAbs):
     }
 
 
+class FocalTestLvmRootExt4(relbase.focal, TestLvmRootAbs):
+    __test__ = True
+    conf_replace = {
+        '__ROOTFS_FORMAT__': 'ext4',
+    }
+
+
 class XenialTestLvmRootXfs(relbase.xenial, TestLvmRootAbs):
     __test__ = True
     conf_replace = {
@@ -122,6 +129,14 @@ class XenialTestUefiLvmRootExt4(relbase.xenial, TestUefiLvmRootAbs):
     }
 
 
+class FocalTestUefiLvmRootExt4(relbase.focal, TestUefiLvmRootAbs):
+    __test__ = True
+    conf_replace = {
+        '__BOOTFS_FORMAT__': 'ext4',
+        '__ROOTFS_FORMAT__': 'ext4',
+    }
+
+
 class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs):
     __test__ = True
     conf_replace = {
@@ -130,7 +145,7 @@ class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs):
     }
 
 
[e-mail]_by_date("1652822", fixby="2019-06-01", install=False)
[e-mail]_by_date("1652822", fixby="2020-06-01", install=False)
 class XenialTestUefiLvmRootXfsBootXfs(relbase.xenial, TestUefiLvmRootAbs):
     """This tests xfs root and xfs boot with uefi.
 
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 1c2396b..ba9d174 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -151,6 +151,10 @@ class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
     __test__ = True
 
 
+class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
+    __test__ = True
+
+
 class TestMirrorbootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot.yaml"
@@ -191,6 +195,10 @@ class EoanTestMirrorboot(relbase.eoan, TestMirrorbootAbs):
     __test__ = True
 
 
+class FocalTestMirrorboot(relbase.focal, TestMirrorbootAbs):
+    __test__ = True
+
+
 class TestMirrorbootPartitionsAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-msdos-partition.yaml"
@@ -236,6 +244,11 @@ class EoanTestMirrorbootPartitions(relbase.eoan,
     __test__ = True
 
 
+class FocalTestMirrorbootPartitions(relbase.focal,
+                                    TestMirrorbootPartitionsAbs):
+    __test__ = True
+
+
 class TestMirrorbootPartitionsUEFIAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-uefi.yaml"
@@ -286,6 +299,11 @@ class EoanTestMirrorbootPartitionsUEFI(relbase.eoan,
     __test__ = True
 
 
+class FocalTestMirrorbootPartitionsUEFI(relbase.focal,
+                                        TestMirrorbootPartitionsUEFIAbs):
+    __test__ = True
+
+
 class TestRaid5bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid5boot.yaml"
@@ -326,6 +344,10 @@ class EoanTestRaid5boot(relbase.eoan, TestRaid5bootAbs):
     __test__ = True
 
 
+class FocalTestRaid5boot(relbase.focal, TestRaid5bootAbs):
+    __test__ = True
+
+
 class TestRaid6bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid6boot.yaml"
@@ -382,6 +404,10 @@ class EoanTestRaid6boot(relbase.eoan, TestRaid6bootAbs):
     __test__ = True
 
 
+class FocalTestRaid6boot(relbase.focal, TestRaid6bootAbs):
+    __test__ = True
+
+
 class TestRaid10bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid10boot.yaml"
@@ -424,6 +450,10 @@ class EoanTestRaid10boot(relbase.eoan, TestRaid10bootAbs):
     __test__ = True
 
 
+class FocalTestRaid10boot(relbase.focal, TestRaid10bootAbs):
+    __test__ = True
+
+
 class TestAllindataAbs(TestMdadmAbs):
     # more complex, needs more time
     # alternative config for more complex setup
@@ -523,4 +553,9 @@ class DiscoTestAllindata(relbase.disco, TestAllindataAbs):
 class EoanTestAllindata(relbase.eoan, TestAllindataAbs):
     __test__ = True
 
+
+class FocalTestAllindata(relbase.focal, 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 cd465c7..c0e6989 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -57,4 +57,9 @@ class DiscoTestIscsiMdadm(relbase.disco, TestMdadmIscsiAbs):
 class EoanTestIscsiMdadm(relbase.eoan, TestMdadmIscsiAbs):
     __test__ = True
 
+
+class FocalTestIscsiMdadm(relbase.focal, TestMdadmIscsiAbs):
+    __test__ = True
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index e0b68ec..339441e 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -87,4 +87,9 @@ class DiscoTestMultipathBasic(relbase.disco, TestMultipathBasicAbs):
 class EoanTestMultipathBasic(relbase.eoan, TestMultipathBasicAbs):
     __test__ = True
 
+
+class FocalTestMultipathBasic(relbase.focal, TestMultipathBasicAbs):
+    __test__ = True
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index 6d3047c..f54e40a 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -480,6 +480,10 @@ class EoanTestNetworkBasic(relbase.eoan, TestNetworkBasicAbs):
     __test__ = True
 
 
+class FocalTestNetworkBasic(relbase.focal, TestNetworkBasicAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkBasic(centos_relbase.centos66_xenial,
                                CentosTestNetworkBasicAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index 995d982..13c89ee 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -59,4 +59,9 @@ class DiscoTestNetworkAlias(relbase.disco, TestNetworkAliasAbs):
 class EoanTestNetworkAlias(relbase.eoan, TestNetworkAliasAbs):
     __test__ = True
 
+
+class FocalTestNetworkAlias(relbase.focal, 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 ec7b48c..b808aec 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -65,6 +65,10 @@ class EoanTestBonding(relbase.eoan, TestNetworkBondingAbs):
     __test__ = True
 
 
+class FocalTestBonding(relbase.focal, TestNetworkBondingAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkBonding(centos_relbase.centos66_xenial,
                                  CentosTestNetworkBondingAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index 129bae6..3b5b99c 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -244,6 +244,10 @@ class EoanTestBridging(relbase.eoan, TestBridgeNetworkAbs):
     __test__ = True
 
 
+class FocalTestBridging(relbase.focal, 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_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index 925cc79..278c837 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -31,6 +31,10 @@ class EoanTestNetworkIPV6Static(relbase.eoan, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
+class FocalTestNetworkIPV6Static(relbase.focal, TestNetworkIPV6StaticAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkIPV6Static(centos_relbase.centos66_xenial,
                                     CentosTestNetworkIPV6StaticAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 93673d0..f0f7389 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -29,11 +29,15 @@ class DiscoTestNetworkIPV6Vlan(relbase.disco, TestNetworkIPV6VlanAbs):
 class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):
     __test__ = True
 
-    @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2019-12-01")
+    @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2020-01-10")
     def test_ip_output(self):
         pass
 
 
+class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkIPV6Vlan(centos_relbase.centos66_xenial,
                                   CentosTestNetworkIPV6VlanAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index 8a55fca..b81ee0e 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -165,21 +165,26 @@ class TestNetworkMtu(relbase.xenial, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2020-01-01")
[e-mail]_by_date("1671951", fixby="2020-01-10")
 class BionicTestNetworkMtu(relbase.bionic, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2020-01-01")
[e-mail]_by_date("1671951", fixby="2020-01-10")
 class DiscoTestNetworkMtu(relbase.disco, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2020-01-01")
[e-mail]_by_date("1671951", fixby="2020-01-10")
 class EoanTestNetworkMtu(relbase.eoan, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2020-01-10")
+class FocalTestNetworkMtu(relbase.focal, TestNetworkMtuAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkMtu(centos_relbase.centos66_xenial,
                              CentosTestNetworkMtuAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index 01f30d5..b2fac16 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -36,6 +36,10 @@ class EoanTestNetworkStatic(relbase.eoan, TestNetworkStaticAbs):
     __test__ = True
 
 
+class FocalTestNetworkStatic(relbase.focal, TestNetworkStaticAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkStatic(centos_relbase.centos66_xenial,
                                 CentosTestNetworkStaticAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index 5a8969c..8e63df8 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -38,6 +38,11 @@ class EoanTestNetworkStaticRoutes(relbase.eoan,
     __test__ = True
 
 
+class FocalTestNetworkStaticRoutes(relbase.focal,
+                                   TestNetworkStaticRoutesAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkStaticRoutes(centos_relbase.centos66_xenial,
                                       CentosTestNetworkStaticRoutesAbs):
     __test__ = False
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 3764973..27aaa2b 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -83,7 +83,15 @@ class DiscoTestNetworkVlan(relbase.disco, TestNetworkVlanAbs):
 class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
     __test__ = True
 
-    @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2019-12-01")
+    @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-01-10")
+    def test_ip_output(self):
+        pass
+
+
+class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
+    __test__ = True
+
+    @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-01-10")
     def test_ip_output(self):
         pass
 
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index bcd5c09..4f0b4d7 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -150,4 +150,9 @@ class DiscoTestNvmeBcache(relbase.disco, TestNvmeBcacheAbs):
 class EoanTestNvmeBcache(relbase.eoan, TestNvmeBcacheAbs):
     __test__ = True
 
+
+class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
+    __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 f01add2..046fff5 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -68,4 +68,9 @@ class DiscoTestPollinateUserAgent(relbase.disco, TestPollinateUserAgent):
 class EoanTestPollinateUserAgent(relbase.eoan, TestPollinateUserAgent):
     __test__ = True
 
+
+class FocalTestPollinateUserAgent(relbase.focal, TestPollinateUserAgent):
+    __test__ = True
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
index 434b71d..6194ab0 100644
--- a/tests/vmtests/test_preserve.py
+++ b/tests/vmtests/test_preserve.py
@@ -32,4 +32,9 @@ class DiscoTestPreserve(relbase.disco, TestPreserve):
 class EoanTestPreserve(relbase.eoan, TestPreserve):
     __test__ = True
 
+
+class FocalTestPreserve(relbase.focal, TestPreserve):
+    __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 678f893..3168f57 100644
--- a/tests/vmtests/test_preserve_raid.py
+++ b/tests/vmtests/test_preserve_raid.py
@@ -32,4 +32,9 @@ class DiscoTestPreserveRAID(relbase.disco, TestPreserveRAID):
 class EoanTestPreserveRAID(relbase.eoan, TestPreserveRAID):
     __test__ = True
 
+
+class FocalTestPreserveRAID(relbase.focal, TestPreserveRAID):
+    __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 90549b2..a2df218 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -90,4 +90,9 @@ class DiscoTestRaid5Bcache(relbase.disco, TestMdadmBcacheAbs):
 class EoanTestRaid5Bcache(relbase.eoan, TestMdadmBcacheAbs):
     __test__ = True
 
+
+class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):
+    __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 3052c9c..af46a9b 100644
--- a/tests/vmtests/test_reuse_raid_member.py
+++ b/tests/vmtests/test_reuse_raid_member.py
@@ -28,35 +28,36 @@ class BionicTestReuseRAIDMember(relbase.bionic, TestReuseRAIDMember):
     __test__ = True
 
 
-class CosmicTestReuseRAIDMember(relbase.cosmic, TestReuseRAIDMember):
+class DiscoTestReuseRAIDMember(relbase.disco, TestReuseRAIDMember):
     __test__ = True
 
 
-class DiscoTestReuseRAIDMember(relbase.disco, TestReuseRAIDMember):
+class EoanTestReuseRAIDMember(relbase.eoan, TestReuseRAIDMember):
     __test__ = True
 
 
-class EoanTestReuseRAIDMember(relbase.eoan, TestReuseRAIDMember):
+class FocalTestReuseRAIDMember(relbase.focal, TestReuseRAIDMember):
     __test__ = True
 
 
-class BionicTestReuseRAIDMemberPartition(
-        relbase.bionic, TestReuseRAIDMemberPartition):
+class BionicTestReuseRAIDMemberPartition(relbase.bionic,
+                                         TestReuseRAIDMemberPartition):
     __test__ = True
 
 
-class CosmicTestReuseRAIDMemberPartition(
-        relbase.cosmic, TestReuseRAIDMemberPartition):
+class DiscoTestReuseRAIDMemberPartition(relbase.disco,
+                                        TestReuseRAIDMemberPartition):
     __test__ = True
 
 
-class DiscoTestReuseRAIDMemberPartition(
-        relbase.disco, TestReuseRAIDMemberPartition):
+class EoanTestReuseRAIDMemberPartition(relbase.eoan,
+                                       TestReuseRAIDMemberPartition):
     __test__ = True
 
 
-class EoanTestReuseRAIDMemberPartition(
-        relbase.eoan, TestReuseRAIDMemberPartition):
+class FocalTestReuseRAIDMemberPartition(relbase.focal,
+                                        TestReuseRAIDMemberPartition):
     __test__ = True
 
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index 8c46af7..9a21879 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -63,6 +63,13 @@ class EoanTestSimple(relbase.eoan, TestSimple):
         self.output_files_exist(["netplan.yaml"])
 
 
+class FocalTestSimple(relbase.focal, 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"
@@ -119,6 +126,13 @@ class EoanTestSimpleStorage(relbase.eoan, TestSimpleStorage):
         self.output_files_exist(["netplan.yaml"])
 
 
+class FocalTestSimpleStorage(relbase.focal, 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"
@@ -138,10 +152,11 @@ class TestGrubNoDefaults(VMBaseClass):
         self.assertNotIn('50-curtin-settings.cfg', grub_d_files)
 
 
-class DiscoTestGrubNoDefaults(relbase.disco, TestGrubNoDefaults):
+class FocalTestGrubNoDefaults(relbase.focal, 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 374b79f..a20506d 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -113,6 +113,10 @@ class EoanUefiTestBasic(relbase.eoan, TestBasicAbs):
     __test__ = True
 
 
+class FocalUefiTestBasic(relbase.focal, TestBasicAbs):
+    __test__ = True
+
+
 class Centos70UefiTestBasic4k(centos_relbase.centos70_xenial, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
@@ -137,4 +141,10 @@ class EoanUefiTestBasic4k(relbase.eoan, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
 
+
+class FocalUefiTestBasic4k(relbase.focal, 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 a0e50e9..86992c3 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -1,3 +1,5 @@
+# This file is part of curtin. See LICENSE file for copyright and license info.
+
 from . import VMBaseClass, check_install_log, skip_if_flag
 from .releases import base_vm_classes as relbase
 
@@ -104,6 +106,11 @@ class EoanTestZfsRoot(relbase.eoan, TestZfsRootAbs):
     mem = 4096
 
 
+class FocalTestZfsRoot(relbase.focal, TestZfsRootAbs):
+    __test__ = True
+    mem = 4096
+
+
 class TestZfsRootFsTypeAbs(TestZfsRootAbs):
     conf_file = "examples/tests/basic-zfsroot.yaml"
 
@@ -131,3 +138,10 @@ class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):
 class EoanTestZfsRootFsType(relbase.eoan, TestZfsRootFsTypeAbs):
     __test__ = True
     mem = 4096
+
+
+class FocalTestZfsRootFsType(relbase.focal, TestZfsRootFsTypeAbs):
+    __test__ = True
+    mem = 4096
+
+# vi: ts=4 expandtab syntax=python
diff --git a/tools/vmtest-filter b/tools/vmtest-filter
index 55e63d5..ae427c3 100755
--- a/tools/vmtest-filter
+++ b/tools/vmtest-filter
@@ -4,7 +4,9 @@
 import argparse
 import logging
 import os
+import pdb
 import sys
+import traceback
 
 # Fix path so we can import helpers
 sys.path.insert(1, os.path.realpath(os.path.join(
@@ -17,7 +19,7 @@ from tests.vmtests.helpers import find_testcases_by_attr  # noqa: E402
 logging.disable(logging.CRITICAL)
 
 
-if __name__ == '__main__':
+def main():
     parser = argparse.ArgumentParser(prog='vmtest-filter',
                                      description='Dump matching testcases',
                                      usage='''vmtest-filter --attr=value''')
@@ -54,4 +56,13 @@ if __name__ == '__main__':
     for tc in find_testcases_by_attr(**kwargs):
         print(tc)
 
+if __name__ == '__main__':
+    try:
+        ret = main()
+    except:
+        traceback.print_exc()
+        pdb.post_mortem()
+        ret = 1
+    sys.exit(ret)
+
 # vi: ts=4 expandtab syntax=python