Merge ~oddbloke/curtin/+git/curtin:ubuntu/devel into curtin:ubuntu/devel

[Dan Watkins]

Upstream snapshot of curtin for release into eoan

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

FAILED: Continuous integration, rev:7892b282fc4d81aed1037dcdadcae388a8efbdc0
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~daniel-thewatkins/curtin/+git/curtin/+merge/367779/+edit-commit-message

https://jenkins.ubuntu.com/server/job/curtin-ci/1269/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1269
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1269
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1269
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1269

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

diff --git a/curtin/__init__.py b/curtin/__init__.py
index d52e1c4..076c135 100644
--- a/curtin/__init__.py
+++ b/curtin/__init__.py
@@ -32,6 +32,6 @@ FEATURES = [
     'HAS_VERSION_MODULE',
 ]
 
-__version__ = "18.2"
+__version__ = "19.1"
 
 # vi: ts=4 expandtab syntax=python
diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index 71882d4..f858b37 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -10,8 +10,9 @@ import tempfile
 
 from curtin import util
 from curtin.block import lvm
+from curtin.block import multipath
 from curtin.log import LOG
-from curtin.udev import udevadm_settle
+from curtin.udev import udevadm_settle, udevadm_info
 
 
 def get_dev_name_entry(devname):
@@ -103,7 +104,15 @@ def partition_kname(disk_kname, partition_number):
     """
     Add number to disk_kname prepending a 'p' if needed
     """
-    for dev_type in ['bcache', 'nvme', 'mmcblk', 'cciss', 'mpath', 'dm', 'md']:
+    if disk_kname.startswith('dm-'):
+        # device-mapper devices may create a new dm device for the partition,
+        # e.g. multipath disk is at dm-2, new partition could be dm-11, but
+        # linux will create a -partX symlink against the disk by-id name.
+        devpath = '/dev/' + disk_kname
+        disk_link = get_device_mapper_links(devpath, first=True)
+        return '%s-part%s' % (disk_link, partition_number)
+
+    for dev_type in ['bcache', 'nvme', 'mmcblk', 'cciss', 'mpath', 'md']:
         if disk_kname.startswith(dev_type):
             partition_number = "p%s" % partition_number
             break
@@ -686,6 +695,21 @@ def disk_to_byid_path(kname):
     return mapping.get(dev_path(kname))
 
 
+def get_device_mapper_links(devpath, first=False):
+    """ Return the best devlink to device at devpath. """
+    info = udevadm_info(devpath)
+    if 'DEVLINKS' not in info:
+        raise ValueError('Device %s does not have device symlinks' % devpath)
+    devlinks = [devlink for devlink in sorted(info['DEVLINKS']) if devlink]
+    if not devlinks:
+        raise ValueError('Unexpected DEVLINKS list contained empty values')
+
+    if first:
+        return devlinks[0]
+
+    return devlinks
+
+
 def lookup_disk(serial):
     """
     Search for a disk by its serial number using /dev/disk/by-id/
@@ -705,7 +729,16 @@ def lookup_disk(serial):
     # will be the partitions on the disk. Then use os.path.realpath to
     # determine the path to the block device in /dev/
     disks.sort(key=lambda x: len(x))
+    LOG.debug('lookup_disks found: %s', disks)
     path = os.path.realpath("/dev/disk/by-id/%s" % disks[0])
+    LOG.debug('lookup_disks realpath(%s)=%s', disks[0], path)
+    if multipath.is_mpath_device(path):
+        LOG.debug('Detected multipath device, finding a members')
+        info = udevadm_info(path)
+        mpath_members = sorted(multipath.find_mpath_members(info['DM_NAME']))
+        LOG.debug('mpath members: %s', mpath_members)
+        if len(mpath_members):
+            path = mpath_members[0]
 
     if not os.path.exists(path):
         raise ValueError("path '%s' to block device for disk with serial '%s' \
diff --git a/curtin/block/clear_holders.py b/curtin/block/clear_holders.py
index fb7fba4..4a099cd 100644
--- a/curtin/block/clear_holders.py
+++ b/curtin/block/clear_holders.py
@@ -15,6 +15,7 @@ from curtin.swap import is_swap_device
 from curtin.block import bcache
 from curtin.block import lvm
 from curtin.block import mdadm
+from curtin.block import multipath
 from curtin.block import zfs
 from curtin.log import LOG
 
@@ -294,6 +295,17 @@ def wipe_superblock(device):
                       device, attempt + 1, len(retries), wait)
             time.sleep(wait)
 
+    # multipath partitions are separate block devices (disks)
+    if multipath.is_mpath_partition(blockdev):
+        multipath.remove_partition(blockdev)
+    # multipath devices must be hidden to utilize a single member (path)
+    elif multipath.is_mpath_device(blockdev):
+        mp_id = multipath.find_mpath_id(blockdev)
+        if mp_id:
+            multipath.remove_map(mp_id)
+        else:
+            raise RuntimeError('Failed to find multipath id for %s' % blockdev)
+
 
 def _wipe_superblock(blockdev, exclusive=True, strict=True):
     """ No checks, just call wipe_volume """
@@ -359,8 +371,15 @@ def identify_partition(device):
     """
     determine if specified device is a partition
     """
-    path = os.path.join(block.sys_block_path(device), 'partition')
-    return os.path.exists(path)
+    blockdev = block.sys_block_path(device)
+    path = os.path.join(blockdev, 'partition')
+    if os.path.exists(path):
+        return True
+
+    if multipath.is_mpath_partition(blockdev):
+        return True
+
+    return False
 
 
 def shutdown_swap(path):
diff --git a/curtin/block/multipath.py b/curtin/block/multipath.py
new file mode 100644
index 0000000..d1e8441
--- /dev/null
+++ b/curtin/block/multipath.py
@@ -0,0 +1,111 @@
+import os
+
+from curtin.log import LOG
+from curtin import util
+from curtin import udev
+
+SHOW_PATHS_FMT = ("device='%d' serial='%z' multipath='%m' host_wwpn='%N' "
+                  "target_wwnn='%n' host_wwpn='%R' target_wwpn='%r' "
+                  "host_adapter='%a'")
+SHOW_MAPS_FMT = "name=%n multipath='%w' sysfs='%d' paths='%N'"
+
+
+def _extract_mpath_data(cmd, show_verb):
+    data, _err = util.subp(cmd, capture=True)
+    result = []
+    for line in data.splitlines():
+        mp_dict = util.load_shell_content(line, add_empty=True)
+        LOG.debug('Extracted multipath %s fields: %s', show_verb, mp_dict)
+        if mp_dict:
+            result.append(mp_dict)
+
+    return result
+
+
+def show_paths():
+    cmd = ['multipathd', 'show', 'paths', 'raw', 'format', SHOW_PATHS_FMT]
+    return _extract_mpath_data(cmd, 'paths')
+
+
+def show_maps():
+    cmd = ['multipathd', 'show', 'maps', 'raw', 'format', SHOW_MAPS_FMT]
+    return _extract_mpath_data(cmd, 'maps')
+
+
+def is_mpath_device(devpath):
+    info = udev.udevadm_info(devpath)
+    if info.get('DM_UUID', '').startswith('mpath-'):
+        return True
+
+    return False
+
+
+def is_mpath_member(devpath):
+    try:
+        util.subp(['multipath', '-c', devpath], capture=True)
+        return True
+    except util.ProcessExecutionError:
+        return False
+
+
+def is_mpath_partition(devpath):
+    if devpath.startswith('/dev/dm-'):
+        if 'DM_PART' in udev.udevadm_info(devpath):
+            LOG.debug("%s is multipath device partition", devpath)
+            return True
+
+    return False
+
+
+def mpath_partition_to_mpath_id(devpath):
+    info = udev.udevadm_info(devpath)
+    if 'DM_MPATH' in info:
+        return info['DM_MPATH']
+
+    return None
+
+
+def remove_partition(devpath, retries=10):
+    LOG.debug('multipath: removing multipath partition: %s', devpath)
+    for _ in range(0, retries):
+        util.subp(['dmsetup', 'remove', devpath], rcs=[0, 1])
+        udev.udevadm_settle()
+        if not os.path.exists(devpath):
+            return
+
+    util.wait_for_removal(devpath)
+
+
+def remove_map(map_id, retries=10):
+    LOG.debug('multipath: removing multipath map: %s', map_id)
+    devpath = '/dev/mapper/%s' % map_id
+    for _ in range(0, retries):
+        util.subp(['multipath', '-f', map_id], rcs=[0, 1])
+        udev.udevadm_settle()
+        if not os.path.exists(devpath):
+            return
+
+    util.wait_for_removal(devpath)
+
+
+def find_mpath_members(multipath_id, paths=None):
+    if not paths:
+        paths = show_paths()
+
+    members = ['/dev/' + path['device']
+               for path in paths if path['multipath'] == multipath_id]
+    return members
+
+
+def find_mpath_id(devpath, maps=None):
+    if not maps:
+        maps = show_maps()
+
+    for mpmap in maps:
+        if '/dev/' + mpmap['sysfs'] == devpath:
+            name = mpmap.get('name')
+            if name:
+                return name
+            return mpmap['multipath']
+
+    return None
diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index b6326fb..c4eed5b 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -484,6 +484,20 @@ def setup_grub(cfg, target, osfamily=DISTROS.debian):
     else:
         env['REPLACE_GRUB_LINUX_DEFAULT'] = "1"
 
+    probe_os = grubcfg.get('probe_additional_os', False)
+    if probe_os not in (False, True):
+        raise ValueError("Unexpected value %s for 'probe_additional_os'. "
+                         "Value must be boolean" % probe_os)
+    env['DISABLE_OS_PROBER'] = "0" if probe_os else "1"
+
+    # if terminal is present in config, but unset, then don't
+    grub_terminal = grubcfg.get('terminal', 'console')
+    if not isinstance(grub_terminal, str):
+        raise ValueError("Unexpected value %s for 'terminal'. "
+                         "Value must be a string" % grub_terminal)
+    if not grub_terminal.lower() == "unmodified":
+        env['GRUB_TERMINAL'] = grub_terminal
+
     if instdevs:
         instdevs = [block.get_dev_name_entry(i)[1] for i in instdevs]
     else:
diff --git a/curtin/config.py b/curtin/config.py
index 9649b10..2106b23 100644
--- a/curtin/config.py
+++ b/curtin/config.py
@@ -76,7 +76,7 @@ def cmdarg2cfg(cmdarg, delim="/"):
 
 
 def load_config_archive(content):
-    archive = yaml.load(content)
+    archive = yaml.safe_load(content)
     config = {}
     for part in archive:
         if isinstance(part, (str,)):
diff --git a/debian/changelog b/debian/changelog
index 4ac90f4..ec06324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+curtin (19.1-0ubuntu1) eoan; urgency=medium
+
+  * New upstream release.
+    - release 19.1
+    - vmtest: add missing skip_by_date on Eoan test_network_mtu
+    - vmtest: remove skip_by_date on Disco Allindata test
+    - block: support multipath devices in lookup and partition_kname
+      (LP: #1813228)
+    - grub: add grub config to control os_prober,terminal settings in target
+    - vmtest: add eoan tests [Paride Legovini]
+    - vmtest: add dependency on python3-jsonschema [Paride Legovini]
+    - Pylint compatibility with Python 3.7 [Paride Legovini] (LP: #1828229)
+    - vmtest: disable disco multipath test
+    - vmtests: bump network mtu tests out a bit
+    - Fix up yaml.load warnings
+    - vmtest: disable trusty, it's dead jim
+
+ -- Daniel Watkins <[e-mail]>  Wed, 22 May 2019 10:26:52 -0400
+
 curtin (18.2-26-gd8e45d79-0ubuntu1) eoan; urgency=medium
 
   * New upstream snapshot.
diff --git a/doc/topics/config.rst b/doc/topics/config.rst
index bad8fc2..b7cca43 100644
--- a/doc/topics/config.rst
+++ b/doc/topics/config.rst
@@ -207,6 +207,27 @@ update the NVRAM settings to preserve the system configuration.
 Users may want to force NVRAM to be updated such that the next boot
 of the system will boot from the installed device.
 
+**probe_additional_os**: *<boolean: default False>*
+
+This setting controls grub's os-prober functionality and Curtin will
+disable this feature by default to prevent grub from searching for other
+operating systems and adding them to the grub menu.
+
+When False, curtin writes "GRUB_DISABLE_OS_PROBER=true" to target system in
+/etc/default/grub.d/50-curtin-settings.cfg.  If True, curtin won't modify the
+grub configuration value in the target system.
+
+**terminal**: *<['unmodified', 'console', ...]>*
+
+Configure target system grub option GRUB_TERMINAL ``terminal`` value
+which is written to /etc/default/grub.d/50-curtin-settings.cfg.  Curtin
+does not attempt to validate this string, grub2 has many values that
+it accepts and the list is platform dependent.  If ``terminal`` is
+not provided, Curtin will set the value to 'console'.  If the ``terminal``
+value is 'unmodified' then Curtin will not set any value at all and will
+use Grub defaults.
+
+
 **Example**::
 
   grub:
@@ -214,6 +235,35 @@ of the system will boot from the installed device.
        - /dev/sda1
      replace_linux_default: False
      update_nvram: True
+     terminal: serial
+
+**Default terminal value, GRUB_TERMINAL=console**::
+
+  grub:
+     install_devices:
+       - /dev/sda1
+
+**Don't set GRUB_TERMINAL in target**::
+
+  grub:
+     install_devices:
+       - /dev/sda1
+     terminal: unmodified
+
+**Allow grub to probe for additional OSes**::
+
+  grub:
+    install_devices:
+      - /dev/sda1
+     probe_additional_os: True
+
+**Avoid writting any settings to etc/default/grub.d/50-curtin-settings.cfg**::
+
+  grub:
+    install_devices:
+      - /dev/sda1
+     probe_additional_os: True
+     terminal: unmodified
 
 
 http_proxy
diff --git a/examples/tests/basic_scsi.yaml b/examples/tests/basic_scsi.yaml
index aa62137..51f5236 100644
--- a/examples/tests/basic_scsi.yaml
+++ b/examples/tests/basic_scsi.yaml
@@ -49,7 +49,7 @@ storage:
         device: sda2_home
       - id: sparedisk_id
         type: disk
-        wwn: '0x080258d13ea95ae5'
+        wwn: '0x2222222222222222'
         name: sparedisk
         wipe: superblock
       - id: sparedisk_fat_fmt_id
diff --git a/examples/tests/no-grub-file.yaml b/examples/tests/no-grub-file.yaml
new file mode 100644
index 0000000..d5ba698
--- /dev/null
+++ b/examples/tests/no-grub-file.yaml
@@ -0,0 +1,9 @@
+# This pushes curtin through a automatic installation
+# where no storage configuration is necessary.
+placeholder_simple_install: unused
+
+# configure curtin so it does not emit a grub config file
+# in etc/default/grub/grub.d
+grub:
+   probe_additional_os: true
+   terminal: unmodified
diff --git a/helpers/common b/helpers/common
index 34f0870..5928150 100644
--- a/helpers/common
+++ b/helpers/common
@@ -779,13 +779,6 @@ install_grub() {
     esac
     debug 1 "carryover command line params '$newargs'"
 
-    case $os_family in
-       debian)
-        : > "$mp/$mygrub_cfg" ||
-            { error "Failed to write '$mygrub_cfg'"; return 1; }
-        ;;
-    esac
-
     if [ "${REPLACE_GRUB_LINUX_DEFAULT:-1}" != "0" ]; then
         apply_grub_cmdline_linux_default "$mp" "$newargs" || {
             error "Failed to apply grub cmdline."
@@ -793,11 +786,19 @@ install_grub() {
         }
     fi
 
-    {
-        echo "# Curtin disable grub os prober that might find other OS installs."
-        echo "GRUB_DISABLE_OS_PROBER=true"
-        echo "GRUB_TERMINAL=console"
-    } >> "$mp/$mygrub_cfg"
+    if [ "${DISABLE_OS_PROBER:-1}" == "1" ]; then
+        {
+            echo "# Curtin disable grub os prober that might find other OS installs."
+            echo "GRUB_DISABLE_OS_PROBER=true"
+        } >> "$mp/$mygrub_cfg"
+    fi
+
+    if [ -n "${GRUB_TERMINAL}" ]; then
+        {
+            echo "# Curtin configured GRUB_TERMINAL value"
+            echo "GRUB_TERMINAL=${GRUB_TERMINAL}"
+        } >> "$mp/$mygrub_cfg"
+    fi
 
     local short="" bd="" grubdev grubdevs_new=""
     grubdevs_new=()
diff --git a/pylintrc b/pylintrc
new file mode 100644
index 0000000..d027f48
--- /dev/null
+++ b/pylintrc
@@ -0,0 +1,10 @@
+[MASTER]
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=0
+
+[TYPECHECK]
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=DISTROS.*
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 0869f1c..9514745 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -121,4 +121,9 @@ def populate_dir(path, files):
 
     return ret
 
+
+def raise_pexec_error(*args, **kwargs):
+    raise util.ProcessExecutionError()
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/unittests/test_apt_custom_sources_list.py b/tests/unittests/test_apt_custom_sources_list.py
index d77c750..fb6eb0c 100644
--- a/tests/unittests/test_apt_custom_sources_list.py
+++ b/tests/unittests/test_apt_custom_sources_list.py
@@ -5,16 +5,17 @@ Test templating of custom sources list
 """
 import logging
 import os
+import yaml
 
 import mock
 from mock import call
 import textwrap
-import yaml
 
 from curtin import distro
 from curtin import paths
 from curtin import util
 from curtin.commands import apt_config
+from curtin.config import load_config
 from .helpers import CiTestCase
 
 LOG = logging.getLogger(__name__)
@@ -233,7 +234,7 @@ class TestApplyPreserveSourcesList(CiTestCase):
         m_get_pkg_ver.assert_has_calls(
             [mock.call('cloud-init', target=self.tmp)])
         self.assertEqual(
-            yaml.load(util.load_file(self.tmp_cfg)),
+            load_config(self.tmp_cfg),
             {'apt_preserve_sources_list': True})
 
     @mock.patch("curtin.commands.apt_config.distro.get_package_version")
@@ -253,7 +254,7 @@ class TestApplyPreserveSourcesList(CiTestCase):
         m_get_pkg_ver.assert_has_calls(
             [mock.call('cloud-init', target=self.tmp)])
         self.assertEqual(
-            yaml.load(util.load_file(self.tmp_cfg)),
+            load_config(self.tmp_cfg),
             {'apt': {'preserve_sources_list': True}})
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/unittests/test_block.py b/tests/unittests/test_block.py
index e932392..c7ebdcc 100644
--- a/tests/unittests/test_block.py
+++ b/tests/unittests/test_block.py
@@ -73,16 +73,18 @@ class TestBlock(CiTestCase):
         res = block.get_blockdev_sector_size('/dev/vda2')
         self.assertEqual(res, (4096, 4096))
 
+    @mock.patch("curtin.block.multipath")
     @mock.patch("curtin.block.os.path.realpath")
     @mock.patch("curtin.block.os.path.exists")
     @mock.patch("curtin.block.os.listdir")
     def test_lookup_disk(self, mock_os_listdir, mock_os_path_exists,
-                         mock_os_path_realpath):
+                         mock_os_path_realpath, mock_mpath):
         serial = "SERIAL123"
         mock_os_listdir.return_value = ["sda_%s-part1" % serial,
                                         "sda_%s" % serial, "other"]
         mock_os_path_exists.return_value = True
         mock_os_path_realpath.return_value = "/dev/sda"
+        mock_mpath.is_mpath_device.return_value = False
 
         path = block.lookup_disk(serial)
 
@@ -101,6 +103,30 @@ class TestBlock(CiTestCase):
             mock_os_listdir.return_value = ["other"]
             block.lookup_disk(serial)
 
+    @mock.patch('curtin.block.udevadm_info')
+    def test_get_device_mapper_links_returns_first_non_none(self, m_info):
+        """ get_device_mapper_links returns first by sort entry in DEVLINKS."""
+        devlinks = [self.random_string(), self.random_string()]
+        m_info.return_value = {'DEVLINKS': devlinks}
+        devpath = self.random_string()
+        self.assertEqual(sorted(devlinks)[0],
+                         block.get_device_mapper_links(devpath, first=True))
+
+    @mock.patch('curtin.block.udevadm_info')
+    def test_get_device_mapper_links_raises_valueerror_no_links(self, m_info):
+        """ get_device_mapper_links raises ValueError if info has no links."""
+        m_info.return_value = {self.random_string(): self.random_string()}
+        with self.assertRaises(ValueError):
+            block.get_device_mapper_links(self.random_string())
+
+    @mock.patch('curtin.block.udevadm_info')
+    def test_get_device_mapper_links_raises_error_no_link_vals(self, m_info):
+        """ get_device_mapper_links raises ValueError if all links are none"""
+        devlinks = ['', '']
+        m_info.return_value = {'DEVLINKS': devlinks}
+        with self.assertRaises(ValueError):
+            block.get_device_mapper_links(self.random_string())
+
     @mock.patch("curtin.block.get_dev_disk_byid")
     def test_disk_to_byid_path(self, mock_byid):
         """ disk_to_byid path returns a /dev/disk/by-id path """
@@ -387,13 +413,17 @@ class TestWipeVolume(CiTestCase):
 
 class TestBlockKnames(CiTestCase):
     """Tests for some of the kname functions in block"""
-    def test_determine_partition_kname(self):
+
+    @mock.patch('curtin.block.get_device_mapper_links')
+    def test_determine_partition_kname(self, m_mlink):
+        dm0_link = '/dev/disk/by-id/dm-name-XXXX2406'
+        m_mlink.return_value = dm0_link
         part_knames = [(('sda', 1), 'sda1'),
                        (('vda', 1), 'vda1'),
                        (('nvme0n1', 1), 'nvme0n1p1'),
                        (('mmcblk0', 1), 'mmcblk0p1'),
                        (('cciss!c0d0', 1), 'cciss!c0d0p1'),
-                       (('dm-0', 1), 'dm-0p1'),
+                       (('dm-0', 1), dm0_link + '-part1'),
                        (('md0', 1), 'md0p1'),
                        (('mpath1', 2), 'mpath1p2')]
         for ((disk_kname, part_number), part_kname) in part_knames:
diff --git a/tests/unittests/test_block_mdadm.py b/tests/unittests/test_block_mdadm.py
index 72610aa..f9164b4 100644
--- a/tests/unittests/test_block_mdadm.py
+++ b/tests/unittests/test_block_mdadm.py
@@ -4,15 +4,11 @@ from mock import call, patch
 from curtin.block import dev_short
 from curtin.block import mdadm
 from curtin import util
-from .helpers import CiTestCase
+from .helpers import CiTestCase, raise_pexec_error
 import os
 import textwrap
 
 
-def _raise_pexec_error(*args, **kwargs):
-    raise util.ProcessExecutionError()
-
-
 class TestBlockMdadmAssemble(CiTestCase):
 
     def setUp(self):
@@ -76,7 +72,7 @@ class TestBlockMdadmAssemble(CiTestCase):
 
     def test_mdadm_assemble_exec_error(self):
         self.mock_util.ProcessExecutionError = util.ProcessExecutionError
-        self.mock_util.subp.side_effect = _raise_pexec_error
+        self.mock_util.subp.side_effect = raise_pexec_error
         with self.assertRaises(util.ProcessExecutionError):
             mdadm.mdadm_assemble(scan=True, ignore_errors=False)
         self.mock_util.subp.assert_called_with(
@@ -306,7 +302,7 @@ class TestBlockMdadmExamine(CiTestCase):
 
     def test_mdadm_examine_no_raid(self):
         self.mock_util.ProcessExecutionError = util.ProcessExecutionError
-        self.mock_util.subp.side_effect = _raise_pexec_error
+        self.mock_util.subp.side_effect = raise_pexec_error
 
         device = "/dev/sda"
         data = mdadm.mdadm_examine(device, export=False)
diff --git a/tests/unittests/test_block_multipath.py b/tests/unittests/test_block_multipath.py
new file mode 100644
index 0000000..0964349
--- /dev/null
+++ b/tests/unittests/test_block_multipath.py
@@ -0,0 +1,149 @@
+import mock
+
+from curtin.block import multipath
+from .helpers import CiTestCase, raise_pexec_error
+
+
+class TestMultipath(CiTestCase):
+
+    def setUp(self):
+        super(TestMultipath, self).setUp()
+        self.add_patch('curtin.block.multipath.util.subp', 'm_subp')
+        self.add_patch('curtin.block.multipath.udev', 'm_udev')
+
+        self.m_subp.return_value = ("", "")
+
+    def test_show_paths(self):
+        self.m_subp.return_value = ("foo=bar wark=2", "")
+        expected = ['multipathd', 'show', 'paths', 'raw', 'format',
+                    multipath.SHOW_PATHS_FMT]
+        self.assertEqual([{'foo': 'bar', 'wark': '2'}],
+                         multipath.show_paths())
+        self.m_subp.assert_called_with(expected, capture=True)
+
+    def test_show_maps(self):
+        self.m_subp.return_value = ("foo=bar wark=2", "")
+        expected = ['multipathd', 'show', 'maps', 'raw', 'format',
+                    multipath.SHOW_MAPS_FMT]
+        self.assertEqual([{'foo': 'bar', 'wark': '2'}],
+                         multipath.show_maps())
+        self.m_subp.assert_called_with(expected, capture=True)
+
+    def test_is_mpath_device_true(self):
+        self.m_udev.udevadm_info.return_value = {'DM_UUID': 'mpath-mpatha-foo'}
+        self.assertTrue(multipath.is_mpath_device(self.random_string()))
+
+    def test_is_mpath_device_false(self):
+        self.m_udev.udevadm_info.return_value = {'DM_UUID': 'lvm-vg-foo-lv1'}
+        self.assertFalse(multipath.is_mpath_device(self.random_string()))
+
+    def test_is_mpath_member_true(self):
+        self.assertTrue(multipath.is_mpath_member(self.random_string()))
+
+    def test_is_mpath_member_false(self):
+        self.m_subp.side_effect = raise_pexec_error
+        self.assertFalse(multipath.is_mpath_member(self.random_string()))
+
+    def test_is_mpath_partition_true(self):
+        dm_device = "/dev/dm-" + self.random_string()
+        self.m_udev.udevadm_info.return_value = {'DM_PART': '1'}
+        self.assertTrue(multipath.is_mpath_partition(dm_device))
+
+    def test_is_mpath_partition_false(self):
+        self.assertFalse(multipath.is_mpath_partition(self.random_string()))
+
+    def test_mpath_partition_to_mpath_id(self):
+        dev = self.random_string()
+        mpath_id = self.random_string()
+        self.m_udev.udevadm_info.return_value = {'DM_MPATH': mpath_id}
+        self.assertEqual(mpath_id,
+                         multipath.mpath_partition_to_mpath_id(dev))
+
+    def test_mpath_partition_to_mpath_id_none(self):
+        dev = self.random_string()
+        self.m_udev.udevadm_info.return_value = {}
+        self.assertEqual(None,
+                         multipath.mpath_partition_to_mpath_id(dev))
+
+    @mock.patch('curtin.block.multipath.os.path.exists')
+    @mock.patch('curtin.block.multipath.util.wait_for_removal')
+    def test_remove_partition(self, m_wait, m_exists):
+        devpath = self.random_string()
+        m_exists.side_effect = iter([True, True, False])
+        multipath.remove_partition(devpath)
+        expected = mock.call(['dmsetup', 'remove', devpath], rcs=[0, 1])
+        self.m_subp.assert_has_calls([expected] * 3)
+        m_wait.assert_not_called()
+        self.assertEqual(3, self.m_udev.udevadm_settle.call_count)
+
+    @mock.patch('curtin.block.multipath.os.path.exists')
+    @mock.patch('curtin.block.multipath.util.wait_for_removal')
+    def test_remove_partition_waits(self, m_wait, m_exists):
+        devpath = self.random_string()
+        m_exists.side_effect = iter([True, True, True])
+        multipath.remove_partition(devpath, retries=3)
+        expected = mock.call(['dmsetup', 'remove', devpath], rcs=[0, 1])
+        self.m_subp.assert_has_calls([expected] * 3)
+        self.assertEqual(3, self.m_udev.udevadm_settle.call_count)
+        self.assertEqual(1, m_wait.call_count)
+
+    @mock.patch('curtin.block.multipath.os.path.exists')
+    @mock.patch('curtin.block.multipath.util.wait_for_removal')
+    def test_remove_map(self, m_wait, m_exists):
+        map_id = self.random_string()
+        devpath = '/dev/mapper/%s' % map_id
+        m_exists.side_effect = iter([True, True, False])
+        multipath.remove_map(devpath)
+        expected = mock.call(['multipath', '-f', devpath], rcs=[0, 1])
+        self.m_subp.assert_has_calls([expected] * 3)
+        m_wait.assert_not_called()
+        self.assertEqual(3, self.m_udev.udevadm_settle.call_count)
+
+    @mock.patch('curtin.block.multipath.os.path.exists')
+    @mock.patch('curtin.block.multipath.util.wait_for_removal')
+    def test_remove_map_wait(self, m_wait, m_exists):
+        map_id = self.random_string()
+        devpath = '/dev/mapper/%s' % map_id
+        m_exists.side_effect = iter([True, True, True])
+        multipath.remove_map(devpath, retries=3)
+        expected = mock.call(['multipath', '-f', devpath], rcs=[0, 1])
+        self.m_subp.assert_has_calls([expected] * 3)
+        self.assertEqual(3, self.m_udev.udevadm_settle.call_count)
+        self.assertEqual(1, m_wait.call_count)
+
+    def test_find_mpath_members(self):
+        mp_id = 'mpatha'
+        paths = ['device=bar multipath=mpatha',
+                 'device=wark multipath=mpatha']
+        self.m_subp.return_value = ("\n".join(paths), "")
+        self.assertEqual(sorted(['/dev/bar', '/dev/wark']),
+                         sorted(multipath.find_mpath_members(mp_id)))
+
+    def test_find_mpath_members_empty(self):
+        mp_id = self.random_string()
+        paths = ['device=bar multipath=mpatha',
+                 'device=wark multipath=mpatha']
+        self.m_subp.return_value = ("\n".join(paths), "")
+        self.assertEqual([], multipath.find_mpath_members(mp_id))
+
+    def test_find_mpath_id(self):
+        mp_id = 'mpatha'
+        maps = ['sysfs=bar multipath=mpatha',
+                'sysfs=wark multipath=mpatha']
+        self.m_subp.return_value = ("\n".join(maps), "")
+        self.assertEqual(mp_id, multipath.find_mpath_id('/dev/bar'))
+
+    def test_find_mpath_id_name(self):
+        maps = ['sysfs=bar multipath=mpatha name=friendly',
+                'sysfs=wark multipath=mpatha']
+        self.m_subp.return_value = ("\n".join(maps), "")
+        self.assertEqual('friendly', multipath.find_mpath_id('/dev/bar'))
+
+    def test_find_mpath_id_none(self):
+        maps = ['sysfs=bar multipath=mpatha',
+                'sysfs=wark multipath=mpatha']
+        self.m_subp.return_value = ("\n".join(maps), "")
+        self.assertEqual(None, multipath.find_mpath_id('/dev/foo'))
+
+
+# vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 5f4a17a..0cfcad3 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -18,6 +18,7 @@ import yaml
 import curtin.net as curtin_net
 import curtin.util as util
 from curtin.block import iscsi
+from curtin.config import load_config
 
 from .report_webhook_logger import CaptureReporting
 from curtin.commands.install import INSTALL_PASS_MSG
@@ -1612,7 +1613,7 @@ class VMBaseClass(TestCase):
         logger.debug('test_dname_rules: checking disks: %s', disk_to_check)
         self.output_files_exist(["udev_rules.d"])
 
-        cfg = yaml.load(self.load_collect_file("root/curtin-install-cfg.yaml"))
+        cfg = load_config(self.collect_path("root/curtin-install-cfg.yaml"))
         stgcfg = cfg.get("storage", {}).get("config", [])
         disks = [ent for ent in stgcfg if (ent.get('type') == 'disk' and
                                            'name' in ent)]
@@ -1751,10 +1752,10 @@ class VMBaseClass(TestCase):
     @classmethod
     def get_class_storage_config(cls):
         sc = cls.load_conf_file()
-        return yaml.load(sc).get('storage', {}).get('config', {})
+        return yaml.safe_load(sc).get('storage', {}).get('config', {})
 
     def get_storage_config(self):
-        cfg = yaml.load(self.load_collect_file("root/curtin-install-cfg.yaml"))
+        cfg = load_config(self.collect_path("root/curtin-install-cfg.yaml"))
         return cfg.get("storage", {}).get("config", [])
 
     def has_storage_config(self):
@@ -1992,7 +1993,7 @@ def generate_user_data(collect_scripts=None, apt_proxy=None,
                                capture=True)
     # precises' cloud-init version has limited support for cloud-config-archive
     # and expects cloud-config pieces to be appendable to a single file and
-    # yaml.load()'able.  Resolve this by using yaml.dump() when generating
+    # yaml.safe_load()'able.  Resolve this by using yaml.dump() when generating
     # a list of parts
     parts = [{'type': 'text/cloud-config',
               'content': yaml.dump(base_cloudconfig, indent=1)},
diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index accd999..1a92412 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -121,6 +121,12 @@ class _DiscoBase(_UbuntuBase):
     mem = "2048"
 
 
+class _EoanBase(_UbuntuBase):
+    release = "eoan"
+    target_release = "eoan"
+    mem = "2048"
+
+
 class _Releases(object):
     trusty = _TrustyBase
     precise = _PreciseBase
@@ -137,6 +143,7 @@ class _Releases(object):
     bionic = _BionicBase
     cosmic = _CosmicBase
     disco = _DiscoBase
+    eoan = _EoanBase
 
 
 class _CentosReleases(object):
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index 1296240..13325e5 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -5,10 +5,10 @@
     apt-config standalone command.
 """
 import textwrap
-import yaml
 
 from . import VMBaseClass
 from .releases import base_vm_classes as relbase
+from curtin.config import load_config
 
 
 class TestAptConfigCMD(VMBaseClass):
@@ -50,7 +50,7 @@ class TestAptConfigCMD(VMBaseClass):
         # For earlier than xenial 'apt_preserve_sources_list' is expected
         self.assertEqual(
             {'apt': {'preserve_sources_list': True}},
-            yaml.load(self.load_collect_file("curtin-preserve-sources.cfg")))
+            load_config(self.collect_path("curtin-preserve-sources.cfg")))
 
 
 class XenialTestAptConfigCMDCMD(relbase.xenial, TestAptConfigCMD):
@@ -71,4 +71,8 @@ class CosmicTestAptConfigCMDCMD(relbase.cosmic, TestAptConfigCMD):
 class DiscoTestAptConfigCMDCMD(relbase.disco, TestAptConfigCMD):
     __test__ = True
 
+
+class EoanTestAptConfigCMDCMD(relbase.eoan, TestAptConfigCMD):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_apt_source.py b/tests/vmtests/test_apt_source.py
index 2cd7267..a090ffa 100644
--- a/tests/vmtests/test_apt_source.py
+++ b/tests/vmtests/test_apt_source.py
@@ -4,13 +4,13 @@
     Collection of tests for the apt configuration features
 """
 import textwrap
-import yaml
 
 from . import VMBaseClass
 from .releases import base_vm_classes as relbase
 
 from unittest import SkipTest
 from curtin import util
+from curtin.config import load_config
 
 
 class TestAptSrcAbs(VMBaseClass):
@@ -67,7 +67,7 @@ class TestAptSrcAbs(VMBaseClass):
         # For earlier than xenial 'apt_preserve_sources_list' is expected
         self.assertEqual(
             {'apt': {'preserve_sources_list': True}},
-            yaml.load(self.load_collect_file("curtin-preserve-sources.cfg")))
+            load_config(self.collect_path("curtin-preserve-sources.cfg")))
 
     def test_source_files(self):
         """test_source_files - Check generated .lists for correct content"""
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index a4a3018..92971b3 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -17,7 +17,7 @@ class TestBasicAbs(VMBaseClass):
     nr_cpus = 2
     dirty_disks = True
     conf_file = "examples/tests/basic.yaml"
-    extra_disks = ['128G', '128G', '4G', '4G']
+    extra_disks = ['15G', '20G', '25G']
     disk_to_check = [('btrfs_volume', 0),
                      ('main_disk_with_in---valid--dname', 0),
                      ('main_disk_with_in---valid--dname', 1),
@@ -81,9 +81,6 @@ class TestBasicAbs(VMBaseClass):
         return kname
 
     def _test_ptable(self, blkid_output, expected):
-        if self.target_release == "trusty":
-            raise SkipTest("No PTTYPE blkid output on trusty")
-
         if not blkid_output:
             raise RuntimeError('_test_ptable requires blkid output file')
 
@@ -237,14 +234,6 @@ class Centos70XenialTestBasic(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestBasic(relbase.trusty, TestBasicAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestBasic(relbase.trusty_hwe_x, TrustyTestBasic):
-    __test__ = True
-
-
 class XenialGAi386TestBasic(relbase.xenial_ga, TestBasicAbs):
     __test__ = True
     arch = 'i386'
@@ -274,10 +263,14 @@ class DiscoTestBasic(relbase.disco, TestBasicAbs):
     __test__ = True
 
 
+class EoanTestBasic(relbase.eoan, TestBasicAbs):
+    __test__ = True
+
+
 class TestBasicScsiAbs(TestBasicAbs):
     conf_file = "examples/tests/basic_scsi.yaml"
     disk_driver = 'scsi-hd'
-    extra_disks = ['128G', '128G', '4G', '4G']
+    extra_disks = ['15G', '20G', '25G']
     extra_collect_scripts = [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         blkid -o export /dev/sda | cat >blkid_output_sda
@@ -354,7 +347,13 @@ class CosmicTestScsiBasic(relbase.cosmic, TestBasicScsiAbs):
     __test__ = True
 
 
[e-mail]_by_date("1813228", fixby="2019-06-02", install=False)
 class DiscoTestScsiBasic(relbase.disco, TestBasicScsiAbs):
     __test__ = True
 
+
[e-mail]_by_date("1813228", fixby="2019-06-02", install=False)
+class EoanTestScsiBasic(relbase.eoan, 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 496faf9..763bc9c 100644
--- a/tests/vmtests/test_basic_dasd.py
+++ b/tests/vmtests/test_basic_dasd.py
@@ -67,4 +67,10 @@ class DiscoTestBasicDasd(relbase.disco, TestBasicDasd):
         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"])
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
index b6044d4..12ed8f6 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -48,14 +48,6 @@ class TestBcacheBasic(VMBaseClass):
         self.check_file_regex("proc_cmdline", r"root=UUID=")
 
 
-class TrustyBcacheBasic(relbase.trusty, TestBcacheBasic):
-    __test__ = False  # covered by test_raid5_bcache
-
-
-class TrustyHWEXBcacheBasic(relbase.trusty_hwe_x, TestBcacheBasic):
-    __test__ = False  # covered by test_raid5_bcache
-
-
 class XenialGABcacheBasic(relbase.xenial_ga, TestBcacheBasic):
     __test__ = True
 
@@ -79,4 +71,8 @@ class CosmicBcacheBasic(relbase.cosmic, TestBcacheBasic):
 class DiscoBcacheBasic(relbase.disco, TestBcacheBasic):
     __test__ = True
 
+
+class EoancacheBasic(relbase.eoan, 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 5410dc3..e6c66fc 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -26,4 +26,8 @@ class CosmicTestBcacheBug1718699(relbase.cosmic, TestBcacheBug1718699):
 class DiscoTestBcacheBug1718699(relbase.disco, TestBcacheBug1718699):
     __test__ = True
 
+
+class EoanTestBcacheBug1718699(relbase.eoan, 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 30820bd..b8b1d9c 100644
--- a/tests/vmtests/test_bcache_ceph.py
+++ b/tests/vmtests/test_bcache_ceph.py
@@ -59,14 +59,6 @@ class TestBcacheCeph(VMBaseClass):
                             self.load_collect_file("bcache_ls").splitlines())
 
 
-class TrustyTestBcacheCeph(relbase.trusty, TestBcacheCeph):
-    __test__ = False  # covered by test_raid5_bcache
-
-
-class TrustyHWEXTestBcacheCeph(relbase.trusty_hwe_x, TestBcacheCeph):
-    __test__ = False  # covered by test_raid5_bcache
-
-
 class XenialGATestBcacheCeph(relbase.xenial_ga, TestBcacheCeph):
     __test__ = True
 
@@ -90,4 +82,8 @@ class CosmicTestBcacheCeph(relbase.cosmic, TestBcacheCeph):
 class DiscoTestBcacheCeph(relbase.disco, TestBcacheCeph):
     __test__ = True
 
+
+class EoanTestBcacheCeph(relbase.eoan, TestBcacheCeph):
+    __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 ff86b51..46dbc88 100644
--- a/tests/vmtests/test_bcache_partitions.py
+++ b/tests/vmtests/test_bcache_partitions.py
@@ -32,4 +32,8 @@ class CosmicTestBcachePartitions(relbase.cosmic, TestBcachePartitions):
 class DiscoTestBcachePartitions(relbase.disco, TestBcachePartitions):
     __test__ = True
 
+
+class EoanTestBcachePartitions(relbase.eoan, 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 347b62a..94850aa 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -124,8 +124,6 @@ class TestFsBattery(VMBaseClass):
 
         # tools for these types do not support providing uuid.
         no_uuid_types = ['vfat', 'jfs', 'fat16', 'fat32', 'ntfs']
-        if self.release in ('trusty'):
-            no_uuid_types += ['btrfs', 'xfs']
 
         for k, v in results.items():
             if v['type'] in no_uuid_types:
@@ -217,14 +215,6 @@ class Centos70XenialTestFsBattery(centos_relbase.centos70_xenial,
         self.assertEqual(sorted(expected), sorted(results))
 
 
-class TrustyTestFsBattery(relbase.trusty, TestFsBattery):
-    __test__ = True
-
-
-class TrustyHWEXTestFsBattery(relbase.trusty_hwe_x, TestFsBattery):
-    __test__ = True
-
-
 class XenialGATestFsBattery(relbase.xenial_ga, TestFsBattery):
     __test__ = True
 
@@ -248,4 +238,8 @@ class CosmicTestFsBattery(relbase.cosmic, TestFsBattery):
 class DiscoTestFsBattery(relbase.disco, TestFsBattery):
     __test__ = True
 
+
+class EoanTestFsBattery(relbase.eoan, TestFsBattery):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_install_umount.py b/tests/vmtests/test_install_umount.py
index 931cf55..566c4c1 100644
--- a/tests/vmtests/test_install_umount.py
+++ b/tests/vmtests/test_install_umount.py
@@ -28,7 +28,7 @@ class TestInstallUnmount(VMBaseClass):
         """Test that install ran with unmount: disabled"""
         collect_curtin_cfg = 'root/curtin-install-cfg.yaml'
         self.output_files_exist([collect_curtin_cfg])
-        curtin_cfg = yaml.load(self.load_collect_file(collect_curtin_cfg))
+        curtin_cfg = yaml.safe_load(self.load_collect_file(collect_curtin_cfg))
 
         # check that we have
         # install:
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index 2707d40..3fb2be9 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -55,10 +55,6 @@ class Centos70XenialTestIscsiBasic(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestIscsiBasic(relbase.trusty, TestBasicIscsiAbs):
-    __test__ = True
-
-
 class XenialGATestIscsiBasic(relbase.xenial_ga, TestBasicIscsiAbs):
     __test__ = True
 
@@ -82,4 +78,8 @@ class CosmicTestIscsiBasic(relbase.cosmic, TestBasicIscsiAbs):
 class DiscoTestIscsiBasic(relbase.disco, TestBasicIscsiAbs):
     __test__ = True
 
+
+class EoanTestIscsiBasic(relbase.eoan, 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 80af61e..71d331c 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -43,4 +43,8 @@ class CosmicTestJournaldReporter(relbase.cosmic, TestJournaldReporter):
 class DiscoTestJournaldReporter(relbase.disco, TestJournaldReporter):
     __test__ = True
 
+
+class EoanTestJournaldReporter(relbase.eoan, TestJournaldReporter):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index fdb5314..d5a7328 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -47,14 +47,6 @@ class Centos70XenialTestLvm(centos_relbase.centos70_xenial, TestLvmAbs):
     __test__ = True
 
 
-class TrustyTestLvm(relbase.trusty, TestLvmAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestLvm(relbase.trusty_hwe_x, TestLvmAbs):
-    __test__ = True
-
-
 class XenialGATestLvm(relbase.xenial_ga, TestLvmAbs):
     __test__ = True
 
@@ -78,4 +70,8 @@ class CosmicTestLvm(relbase.cosmic, TestLvmAbs):
 class DiscoTestLvm(relbase.disco, TestLvmAbs):
     __test__ = True
 
+
+class EoanTestLvm(relbase.eoan, 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 6cdcab2..9e42163 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -62,10 +62,6 @@ class Centos70XenialTestLvmIscsi(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestIscsiLvm(relbase.trusty, TestLvmIscsiAbs):
-    __test__ = True
-
-
 class XenialTestIscsiLvm(relbase.xenial, TestLvmIscsiAbs):
     __test__ = True
 
@@ -93,4 +89,8 @@ class CosmicTestIscsiLvm(relbase.cosmic, TestLvmIscsiAbs):
 class DiscoTestIscsiLvm(relbase.disco, TestLvmIscsiAbs):
     __test__ = True
 
+
+class EoanTestIscsiLvm(relbase.eoan, 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 d70f3ef..155bbb9 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -43,6 +43,10 @@ class TestLvmOverRaidAbs(TestMdadmAbs, TestLvmAbs):
         self.check_file_strippedline("pvs", "vg0=/dev/md1")
 
 
+class EoanTestLvmOverRaid(relbase.eoan, TestLvmOverRaidAbs):
+    __test__ = True
+
+
 class DiscoTestLvmOverRaid(relbase.disco, TestLvmOverRaidAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
index d726a45..33deeac 100644
--- a/tests/vmtests/test_lvm_root.py
+++ b/tests/vmtests/test_lvm_root.py
@@ -48,7 +48,7 @@ class TestLvmRootAbs(VMBaseClass):
             self.assertEqual(self.conf_replace['__ROOTFS_FORMAT__'],
                              entry['fstype'])
         else:
-            # no json output on trusty
+            # no json output on older releases
             self.output_files_exist(["lsblk.out"])
             lsblk_data = open(self.collect_path('lsblk.out')).readlines()
             print(lsblk_data)
@@ -77,22 +77,6 @@ class Centos70XenialTestLvmRootXfs(centos_relbase.centos70_xenial,
     }
 
 
-class TrustyTestLvmRootExt4(relbase.trusty, TestLvmRootAbs):
-    __test__ = True
-    conf_replace = {
-        '__ROOTFS_FORMAT__': 'ext4',
-    }
-
-
-class TrustyTestLvmRootXfs(relbase.trusty, TestLvmRootAbs):
-    __test__ = True
-    # xfs on trusty can't support uuid=
-    fstab_expected = {}
-    conf_replace = {
-        '__ROOTFS_FORMAT__': 'xfs',
-    }
-
-
 class XenialTestLvmRootExt4(relbase.xenial, TestLvmRootAbs):
     __test__ = True
     conf_replace = {
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 7168465..6f8bea7 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -127,15 +127,6 @@ class TestMdadmBcacheAbs(TestMdadmAbs):
         self.test_dname(disk_to_check=self.bcache_dnames)
 
 
[e-mail]_by_date("1754581", fixby="2020-01-22", install=False)
-class TrustyTestMdadmBcache(relbase.trusty, TestMdadmBcacheAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestMdadmBcache(relbase.trusty_hwe_x, TestMdadmBcacheAbs):
-    __test__ = True
-
-
 class XenialGATestMdadmBcache(relbase.xenial_ga, TestMdadmBcacheAbs):
     __test__ = True
 
@@ -160,6 +151,10 @@ class DiscoTestMdadmBcache(relbase.disco, TestMdadmBcacheAbs):
     __test__ = True
 
 
+class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
+    __test__ = True
+
+
 class TestMirrorbootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot.yaml"
@@ -176,15 +171,6 @@ class Centos70TestMirrorboot(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestMirrorboot(relbase.trusty, TestMirrorbootAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestMirrorboot(relbase.trusty_hwe_x, TestMirrorbootAbs):
-    # This tests kernel upgrade in target
-    __test__ = True
-
-
 class XenialGATestMirrorboot(relbase.xenial_ga, TestMirrorbootAbs):
     __test__ = True
 
@@ -209,6 +195,10 @@ class DiscoTestMirrorboot(relbase.disco, TestMirrorbootAbs):
     __test__ = True
 
 
+class EoanTestMirrorboot(relbase.eoan, TestMirrorbootAbs):
+    __test__ = True
+
+
 class TestMirrorbootPartitionsAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-msdos-partition.yaml"
@@ -224,17 +214,6 @@ class Centos70TestMirrorbootPartitions(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestMirrorbootPartitions(relbase.trusty,
-                                     TestMirrorbootPartitionsAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestMirrorbootPartitions(relbase.trusty_hwe_x,
-                                         TestMirrorbootPartitionsAbs):
-    # This tests kernel upgrade in target
-    __test__ = True
-
-
 class XenialGATestMirrorbootPartitions(relbase.xenial_ga,
                                        TestMirrorbootPartitionsAbs):
     __test__ = True
@@ -265,6 +244,11 @@ class DiscoTestMirrorbootPartitions(relbase.disco,
     __test__ = True
 
 
+class EoanTestMirrorbootPartitions(relbase.eoan,
+                                   TestMirrorbootPartitionsAbs):
+    __test__ = True
+
+
 class TestMirrorbootPartitionsUEFIAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-uefi.yaml"
@@ -285,11 +269,6 @@ class Centos70TestMirrorbootPartitionsUEFI(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestMirrorbootPartitionsUEFI(relbase.trusty,
-                                         TestMirrorbootPartitionsUEFIAbs):
-    __test__ = True
-
-
 class XenialGATestMirrorbootPartitionsUEFI(relbase.xenial_ga,
                                            TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
@@ -320,6 +299,11 @@ class DiscoTestMirrorbootPartitionsUEFI(relbase.disco,
     __test__ = True
 
 
+class EoanTestMirrorbootPartitionsUEFI(relbase.eoan,
+                                       TestMirrorbootPartitionsUEFIAbs):
+    __test__ = True
+
+
 class TestRaid5bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid5boot.yaml"
@@ -336,15 +320,6 @@ class Centos70TestRaid5boot(centos_relbase.centos70_xenial, TestRaid5bootAbs):
     __test__ = True
 
 
-class TrustyTestRaid5boot(relbase.trusty, TestRaid5bootAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestRaid5boot(relbase.trusty_hwe_x, TestRaid5bootAbs):
-    # This tests kernel upgrade in target
-    __test__ = True
-
-
 class XenialGATestRaid5boot(relbase.xenial_ga, TestRaid5bootAbs):
     __test__ = True
 
@@ -369,6 +344,10 @@ class DiscoTestRaid5boot(relbase.disco, TestRaid5bootAbs):
     __test__ = True
 
 
+class EoanTestRaid5boot(relbase.eoan, TestRaid5bootAbs):
+    __test__ = True
+
+
 class TestRaid6bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid6boot.yaml"
@@ -401,14 +380,6 @@ class Centos70TestRaid6boot(centos_relbase.centos70_xenial, TestRaid6bootAbs):
     __test__ = True
 
 
-class TrustyTestRaid6boot(relbase.trusty, TestRaid6bootAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestRaid6boot(relbase.trusty_hwe_x, TestRaid6bootAbs):
-    __test__ = True
-
-
 class XenialGATestRaid6boot(relbase.xenial_ga, TestRaid6bootAbs):
     __test__ = True
 
@@ -433,6 +404,10 @@ class DiscoTestRaid6boot(relbase.disco, TestRaid6bootAbs):
     __test__ = True
 
 
+class EoanTestRaid6boot(relbase.eoan, TestRaid6bootAbs):
+    __test__ = True
+
+
 class TestRaid10bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid10boot.yaml"
@@ -451,14 +426,6 @@ class Centos70TestRaid10boot(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestRaid10boot(relbase.trusty, TestRaid10bootAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestRaid10boot(relbase.trusty_hwe_x, TestRaid10bootAbs):
-    __test__ = True
-
-
 class XenialGATestRaid10boot(relbase.xenial_ga, TestRaid10bootAbs):
     __test__ = True
 
@@ -483,6 +450,10 @@ class DiscoTestRaid10boot(relbase.disco, TestRaid10bootAbs):
     __test__ = True
 
 
+class EoanTestRaid10boot(relbase.eoan, TestRaid10bootAbs):
+    __test__ = True
+
+
 class TestAllindataAbs(TestMdadmAbs):
     # more complex, needs more time
     # alternative config for more complex setup
@@ -559,14 +530,6 @@ class TestAllindataAbs(TestMdadmAbs):
         self.check_file_regex("xfs_info", r"^meta-data=/dev/mapper/dmcrypt0")
 
 
-class TrustyTestAllindata(relbase.trusty, TestAllindataAbs):
-    __test__ = False  # luks=no does not disable mounting of device
-
-
-class TrustyHWEXTestAllindata(relbase.trusty_hwe_x, TestAllindataAbs):
-    __test__ = False  # lukes=no does not disable mounting of device
-
-
 class XenialGATestAllindata(relbase.xenial_ga, TestAllindataAbs):
     __test__ = True
 
@@ -587,8 +550,11 @@ class CosmicTestAllindata(relbase.cosmic, TestAllindataAbs):
     __test__ = True
 
 
[e-mail]_by_date("1818876", fixby="2019-04-22", install=False)
 class DiscoTestAllindata(relbase.disco, TestAllindataAbs):
     __test__ = True
 
+
+class EoanTestAllindata(relbase.eoan, 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 b43855d..fa8d88f 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -34,10 +34,6 @@ class Centos70TestIscsiMdadm(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestIscsiMdadm(relbase.trusty, TestMdadmIscsiAbs):
-    __test__ = True
-
-
 class XenialGATestIscsiMdadm(relbase.xenial_ga, TestMdadmIscsiAbs):
     __test__ = True
 
@@ -61,4 +57,8 @@ class CosmicTestIscsiMdadm(relbase.cosmic, TestMdadmIscsiAbs):
 class DiscoTestIscsiMdadm(relbase.disco, TestMdadmIscsiAbs):
     __test__ = True
 
+
+class EoanTestIscsiMdadm(relbase.eoan, TestMdadmIscsiAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index a22bc0f..7711198 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -64,15 +64,6 @@ class Centos70TestMultipathBasic(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestMultipathBasic(relbase.trusty, TestMultipathBasicAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestMultipathBasic(relbase.trusty_hwe_x,
-                                   TestMultipathBasicAbs):
-    __test__ = True
-
-
 class XenialGATestMultipathBasic(relbase.xenial_ga, TestMultipathBasicAbs):
     __test__ = True
 
@@ -93,7 +84,13 @@ class CosmicTestMultipathBasic(relbase.cosmic, TestMultipathBasicAbs):
     __test__ = True
 
 
[e-mail]_by_date("1813228", fixby="2019-06-02", install=False)
 class DiscoTestMultipathBasic(relbase.disco, TestMultipathBasicAbs):
     __test__ = True
 
+
[e-mail]_by_date("1813228", fixby="2019-06-02", install=False)
+class EoanTestMultipathBasic(relbase.eoan, TestMultipathBasicAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index 1b0e41c..2c3b73c 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -440,29 +440,6 @@ class CentosTestNetworkBasicAbs(TestNetworkBaseTestsAbs):
         pass
 
 
-class TrustyTestNetworkBasic(relbase.trusty, TestNetworkBasicAbs):
-    __test__ = True
-
-
-class TrustyHWEUTestNetworkBasic(relbase.trusty_hwe_u, TrustyTestNetworkBasic):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEVTestNetworkBasic(relbase.trusty_hwe_v, TrustyTestNetworkBasic):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEWTestNetworkBasic(relbase.trusty_hwe_w, TrustyTestNetworkBasic):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEXTestNetworkBasic(relbase.trusty_hwe_x, TrustyTestNetworkBasic):
-    __test__ = True
-
-
 class XenialTestNetworkBasic(relbase.xenial, TestNetworkBasicAbs):
     __test__ = True
 
@@ -479,6 +456,10 @@ class DiscoTestNetworkBasic(relbase.disco, TestNetworkBasicAbs):
     __test__ = True
 
 
+class EoanTestNetworkBasic(relbase.eoan, 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 b2c4ed7..fb4fb2c 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -44,29 +44,6 @@ class Centos70TestNetworkAlias(centos_relbase.centos70_xenial,
     __test__ = True
 
 
-class TrustyTestNetworkAlias(relbase.trusty, TestNetworkAliasAbs):
-    __test__ = True
-
-
-class TrustyHWEUTestNetworkAlias(relbase.trusty_hwe_u, TrustyTestNetworkAlias):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEVTestNetworkAlias(relbase.trusty_hwe_v, TrustyTestNetworkAlias):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEWTestNetworkAlias(relbase.trusty_hwe_w, TrustyTestNetworkAlias):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEXTestNetworkAlias(relbase.trusty_hwe_x, TrustyTestNetworkAlias):
-    __test__ = True
-
-
 class XenialTestNetworkAlias(relbase.xenial, TestNetworkAliasAbs):
     __test__ = True
 
@@ -82,4 +59,8 @@ class CosmicTestNetworkAlias(relbase.cosmic, TestNetworkAliasAbs):
 class DiscoTestNetworkAlias(relbase.disco, TestNetworkAliasAbs):
     __test__ = True
 
+
+class EoanTestNetworkAlias(relbase.eoan, 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 fe3abe9..a66591a 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -49,26 +49,6 @@ class CentosTestNetworkBondingAbs(TestNetworkBondingAbs):
         pass
 
 
-class TrustyTestBonding(relbase.trusty, TestNetworkBondingAbs):
-    __test__ = False
-
-
-class TrustyHWEVTestBonding(relbase.trusty_hwe_v, TrustyTestBonding):
-    # Working, but off by default to save test suite runtime
-    # oldest/newest HWE-* covered above/below
-    __test__ = False
-
-
-class TrustyHWEWTestBonding(relbase.trusty_hwe_w, TrustyTestBonding):
-    # Working, but off by default to save test suite runtime
-    # oldest/newest HWE-* covered above/below
-    __test__ = False
-
-
-class TrustyHWEXTestBonding(relbase.trusty_hwe_x, TrustyTestBonding):
-    __test__ = True
-
-
 class XenialTestBonding(relbase.xenial, TestNetworkBondingAbs):
     __test__ = True
 
@@ -85,6 +65,10 @@ class DiscoTestBonding(relbase.disco, TestNetworkBondingAbs):
     __test__ = True
 
 
+class EoanTestBonding(relbase.eoan, 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 8576d60..b3ec287 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -243,4 +243,8 @@ class CosmicTestBridging(relbase.cosmic, TestBridgeNetworkAbs):
 class DiscoTestBridging(relbase.disco, TestBridgeNetworkAbs):
     __test__ = True
 
+
+class EoanTestBridging(relbase.eoan, TestBridgeNetworkAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network_enisource.py b/tests/vmtests/test_network_enisource.py
index 48baecf..476275c 100644
--- a/tests/vmtests/test_network_enisource.py
+++ b/tests/vmtests/test_network_enisource.py
@@ -82,15 +82,6 @@ class TestNetworkENISource(TestNetworkBaseTestsAbs):
         self.assertEqual(_nocidr(expected_address), _nocidr(actual_address))
 
 
-class TrustyTestNetworkENISource(relbase.trusty, TestNetworkENISource):
-    __test__ = True
-
-
-class TrustyHWEXTestNetworkENISource(relbase.trusty_hwe_x,
-                                     TestNetworkENISource):
-    __test__ = True
-
-
 class XenialTestNetworkENISource(relbase.xenial, TestNetworkENISource):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index 42adb20..9b6acc9 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -45,25 +45,6 @@ class CentosTestNetworkIPV6Abs(TestNetworkIPV6Abs):
         pass
 
 
-class TrustyTestNetworkIPV6(relbase.trusty, TestNetworkIPV6Abs):
-    __test__ = True
-
-
-class TrustyHWEVTestNetworkIPV6(relbase.trusty_hwe_v, TrustyTestNetworkIPV6):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEWTestNetworkIPV6(relbase.trusty_hwe_w, TrustyTestNetworkIPV6):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEXTestNetworkIPV6(relbase.trusty_hwe_x, TrustyTestNetworkIPV6):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
 class XenialTestNetworkIPV6(relbase.xenial, TestNetworkIPV6Abs):
     __test__ = True
 
@@ -80,6 +61,10 @@ class DiscoTestNetworkIPV6(relbase.disco, TestNetworkIPV6Abs):
     __test__ = True
 
 
+class EoanTestNetworkIPV6(relbase.eoan, TestNetworkIPV6Abs):
+    __test__ = True
+
+
 class Centos66TestNetworkIPV6(centos_relbase.centos66_xenial,
                               CentosTestNetworkIPV6Abs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ipv6_enisource.py b/tests/vmtests/test_network_ipv6_enisource.py
index 0c92039..bd03bdd 100644
--- a/tests/vmtests/test_network_ipv6_enisource.py
+++ b/tests/vmtests/test_network_ipv6_enisource.py
@@ -14,15 +14,6 @@ class TestNetworkIPV6ENISource(TestNetworkENISource):
         pass
 
 
-class TrustyTestNetworkIPV6ENISource(relbase.trusty, TestNetworkIPV6ENISource):
-    __test__ = True
-
-
-class TrustyHWEXTestNetworkIPV6ENISource(relbase.trusty_hwe_x,
-                                         TestNetworkIPV6ENISource):
-    __test__ = True
-
-
 class XenialTestNetworkIPV6ENISource(relbase.xenial, TestNetworkIPV6ENISource):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index bbd90c9..b79b9e4 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -15,33 +15,6 @@ class CentosTestNetworkIPV6StaticAbs(CentosTestNetworkStaticAbs):
     conf_file = "examples/tests/basic_network_static_ipv6.yaml"
 
 
-class TrustyTestNetworkIPV6Static(relbase.trusty, TestNetworkIPV6StaticAbs):
-    __test__ = True
-
-
-class TrustyHWEUTestNetworkIPV6Static(relbase.trusty_hwe_u,
-                                      TestNetworkIPV6StaticAbs):
-    # unsupported kernel, 2016-08
-    __test__ = False
-
-
-class TrustyHWEVTestNetworkIPV6Static(relbase.trusty_hwe_v,
-                                      TestNetworkIPV6StaticAbs):
-    # unsupported kernel, 2016-08
-    __test__ = False
-
-
-class TrustyHWEWTestNetworkIPV6Static(relbase.trusty_hwe_w,
-                                      TestNetworkIPV6StaticAbs):
-    # unsupported kernel, 2016-08
-    __test__ = False
-
-
-class TrustyHWEXTestNetworkIPV6Static(relbase.trusty_hwe_x,
-                                      TestNetworkIPV6StaticAbs):
-    __test__ = True
-
-
 class XenialTestNetworkIPV6Static(relbase.xenial, TestNetworkIPV6StaticAbs):
     __test__ = True
 
@@ -58,6 +31,10 @@ class DiscoTestNetworkIPV6Static(relbase.disco, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
+class EoanTestNetworkIPV6Static(relbase.eoan, 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 7401d2c..138ea6a 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -14,15 +14,6 @@ class CentosTestNetworkIPV6VlanAbs(CentosTestNetworkVlanAbs):
     conf_file = "examples/tests/vlan_network_ipv6.yaml"
 
 
-class TrustyTestNetworkIPV6Vlan(relbase.trusty, TestNetworkIPV6VlanAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestNetworkIPV6Vlan(relbase.trusty_hwe_x,
-                                    TestNetworkIPV6VlanAbs):
-    __test__ = True
-
-
 class XenialTestNetworkIPV6Vlan(relbase.xenial, TestNetworkIPV6VlanAbs):
     __test__ = True
 
@@ -39,6 +30,10 @@ class DiscoTestNetworkIPV6Vlan(relbase.disco, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
+class EoanTestNetworkIPV6Vlan(relbase.eoan, 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 affa6aa..30cc2c8 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -161,54 +161,30 @@ class CentosTestNetworkMtuAbs(TestNetworkMtuAbs):
         pass
 
 
-class TrustyTestNetworkMtu(relbase.trusty, TestNetworkMtuAbs):
-    __test__ = True
-
-    # FIXME: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809714
-    # fixed in newer ifupdown than is in trusty
-    def test_ipv6_mtu_smaller_than_ipv4_non_default(self):
-        # trusty ifupdown uses device mtu to change v6 mtu
-        pass
-
-
-class TrustyHWEUTestNetworkMtu(relbase.trusty_hwe_u, TrustyTestNetworkMtu):
-    # unsupported kernel, 2016-08
-    __test__ = False
-
-
-class TrustyHWEVTestNetworkMtu(relbase.trusty_hwe_v, TrustyTestNetworkMtu):
-    # unsupported kernel, 2016-08
-    __test__ = False
-
-
-class TrustyHWEWTestNetworkMtu(relbase.trusty_hwe_w, TrustyTestNetworkMtu):
-    # unsupported kernel, 2016-08
-    __test__ = False
-
-
-class TrustyHWEXTestNetworkMtu(relbase.trusty_hwe_x, TrustyTestNetworkMtu):
-    __test__ = True
-
-
 class TestNetworkMtu(relbase.xenial, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2019-05-02")
[e-mail]_by_date("1671951", fixby="2019-10-02")
 class BionicTestNetworkMtu(relbase.bionic, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2019-05-02")
[e-mail]_by_date("1671951", fixby="2019-10-02")
 class CosmicTestNetworkMtu(relbase.cosmic, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2019-05-02")
[e-mail]_by_date("1671951", fixby="2019-10-02")
 class DiscoTestNetworkMtu(relbase.disco, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2019-10-02")
+class EoanTestNetworkMtu(relbase.eoan, 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 6820c33..9706a2d 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -20,33 +20,6 @@ class CentosTestNetworkStaticAbs(TestNetworkStaticAbs):
         pass
 
 
-class TrustyTestNetworkStatic(relbase.trusty, TestNetworkStaticAbs):
-    __test__ = True
-
-
-class TrustyHWEUTestNetworkStatic(relbase.trusty_hwe_u,
-                                  TrustyTestNetworkStatic):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEVTestNetworkStatic(relbase.trusty_hwe_v,
-                                  TrustyTestNetworkStatic):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEWTestNetworkStatic(relbase.trusty_hwe_w,
-                                  TrustyTestNetworkStatic):
-    # Working, off by default to safe test suite runtime, covered by bonding
-    __test__ = False
-
-
-class TrustyHWEXTestNetworkStatic(relbase.trusty_hwe_x,
-                                  TrustyTestNetworkStatic):
-    __test__ = True
-
-
 class XenialTestNetworkStatic(relbase.xenial, TestNetworkStaticAbs):
     __test__ = True
 
@@ -63,6 +36,10 @@ class DiscoTestNetworkStatic(relbase.disco, TestNetworkStaticAbs):
     __test__ = True
 
 
+class EoanTestNetworkStatic(relbase.eoan, 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 405a730..b441bc9 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -18,32 +18,6 @@ class CentosTestNetworkStaticRoutesAbs(CentosTestNetworkBasicAbs):
     conf_file = "examples/tests/network_static_routes.yaml"
 
 
-class TrustyTestNetworkStaticRoutes(relbase.trusty,
-                                    TestNetworkStaticRoutesAbs):
-    __test__ = True
-
-
-class TrustyHWEUTestNetworkStaticRoutes(relbase.trusty_hwe_u,
-                                        TrustyTestNetworkStaticRoutes):
-    # Working, off by default to save test suite runtime, covered by
-    # TrustyTestNetworkStaticRoutes
-    __test__ = False
-
-
-class TrustyHWEVTestNetworkStaticRoutes(relbase.trusty_hwe_v,
-                                        TrustyTestNetworkStaticRoutes):
-    # Working, off by default to save test suite runtime, covered by
-    # TrustyTestNetworkStaticRoutes
-    __test__ = False
-
-
-class TrustyHWEWTestNetworkStaticRoutes(relbase.trusty_hwe_w,
-                                        TrustyTestNetworkStaticRoutes):
-    # Working, off by default to save test suite runtime, covered by
-    # TrustyTestNetworkStaticRoutes
-    __test__ = False
-
-
 class XenialTestNetworkStaticRoutes(relbase.xenial,
                                     TestNetworkStaticRoutesAbs):
     __test__ = True
@@ -64,6 +38,11 @@ class DiscoTestNetworkStaticRoutes(relbase.disco,
     __test__ = True
 
 
+class EoanTestNetworkStaticRoutes(relbase.eoan,
+                                  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 904f8c2..88e3d35 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -68,14 +68,6 @@ class CentosTestNetworkVlanAbs(TestNetworkVlanAbs):
         pass
 
 
-class TrustyTestNetworkVlan(relbase.trusty, TestNetworkVlanAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestNetworkVlan(relbase.trusty_hwe_x, TestNetworkVlanAbs):
-    __test__ = True
-
-
 class XenialTestNetworkVlan(relbase.xenial, TestNetworkVlanAbs):
     __test__ = True
 
@@ -92,6 +84,10 @@ class DiscoTestNetworkVlan(relbase.disco, TestNetworkVlanAbs):
     __test__ = True
 
 
+class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkVlan(centos_relbase.centos66_xenial,
                               CentosTestNetworkVlanAbs):
     __test__ = True
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index 60d9d86..730057e 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -57,14 +57,6 @@ class Centos70TestNvme(centos70_xenial, TestNvmeAbs):
     __test__ = True
 
 
-class TrustyTestNvme(relbase.trusty, TestNvmeAbs):
-    __test__ = True
-
-
-class TrustyHWEXTestNvme(relbase.trusty_hwe_x, TestNvmeAbs):
-    __test__ = True
-
-
 class XenialGATestNvme(relbase.xenial_ga, TestNvmeAbs):
     __test__ = True
 
@@ -85,7 +77,11 @@ class CosmicTestNvme(relbase.cosmic, TestNvmeAbs):
     __test__ = True
 
 
-class DiscoTestNvme(relbase.cosmic, TestNvmeAbs):
+class DiscoTestNvme(relbase.disco, TestNvmeAbs):
+    __test__ = True
+
+
+class EoanTestNvme(relbase.eoan, TestNvmeAbs):
     __test__ = True
 
 
@@ -158,4 +154,8 @@ class CosmicTestNvmeBcache(relbase.cosmic, TestNvmeBcacheAbs):
 class DiscoTestNvmeBcache(relbase.disco, TestNvmeBcacheAbs):
     __test__ = True
 
+
+class EoanTestNvmeBcache(relbase.eoan, TestNvmeBcacheAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_old_apt_features.py b/tests/vmtests/test_old_apt_features.py
index ec3765c..a114bf4 100644
--- a/tests/vmtests/test_old_apt_features.py
+++ b/tests/vmtests/test_old_apt_features.py
@@ -5,12 +5,13 @@
 """
 import re
 import textwrap
-import yaml
+
 
 from . import VMBaseClass
 from .releases import base_vm_classes as relbase
 
 from curtin import util
+from curtin.config import load_config
 
 
 def sources_to_dict(lines):
@@ -75,7 +76,7 @@ class TestOldAptAbs(VMBaseClass):
         # For earlier than xenial 'apt_preserve_sources_list' is expected
         self.assertEqual(
             {'apt': {'preserve_sources_list': True}},
-            yaml.load(self.load_collect_file("curtin-preserve-sources.cfg")))
+            load_config(self.collect_path("curtin-preserve-sources.cfg")))
 
     def test_debconf(self):
         """test_debconf - Check if debconf is in place"""
diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
index c1c6c36..d9d9d9d 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -53,10 +53,6 @@ class TestPollinateUserAgent(VMBaseClass):
             self.assertEqual(ua_val, hit.group())
 
 
-class TrustyTestPollinateUserAgent(relbase.trusty, TestPollinateUserAgent):
-    __test__ = True
-
-
 class XenialTestPollinateUserAgent(relbase.xenial, TestPollinateUserAgent):
     __test__ = True
 
@@ -72,4 +68,8 @@ class CosmicTestPollinateUserAgent(relbase.cosmic, TestPollinateUserAgent):
 class DiscoTestPollinateUserAgent(relbase.disco, TestPollinateUserAgent):
     __test__ = True
 
+
+class EoanTestPollinateUserAgent(relbase.eoan, TestPollinateUserAgent):
+    __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 347b607..67a794d 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -67,27 +67,6 @@ class TestMdadmBcacheAbs(TestMdadmAbs):
         self.check_file_regex("bcache_cache_mode", r"\[writeback\]")
 
 
[e-mail]_by_date("1820754", fixby="2020-03-18", install=False)
-class TrustyTestRaid5Bcache(relbase.trusty, TestMdadmBcacheAbs):
-    __test__ = True
-
-
-class TrustyHWEUTestRaid5Bcache(relbase.trusty_hwe_u, TrustyTestRaid5Bcache):
-    __test__ = False
-
-
-class TrustyHWEVTestRaid5Bcache(relbase.trusty_hwe_v, TrustyTestRaid5Bcache):
-    __test__ = False
-
-
-class TrustyHWEWTestRaid5Bcache(relbase.trusty_hwe_w, TrustyTestRaid5Bcache):
-    __test__ = False
-
-
-class TrustyHWEXTestRaid5Bcache(relbase.trusty_hwe_x, TrustyTestRaid5Bcache):
-    __test__ = True
-
-
 class XenialGATestRaid5Bcache(relbase.xenial_ga, TestMdadmBcacheAbs):
     __test__ = True
 
@@ -111,4 +90,8 @@ class CosmicTestRaid5Bcache(relbase.cosmic, TestMdadmBcacheAbs):
 class DiscoTestRaid5Bcache(relbase.disco, TestMdadmBcacheAbs):
     __test__ = True
 
+
+class EoanTestRaid5Bcache(relbase.eoan, TestMdadmBcacheAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index 625f841..bfac4e9 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -4,6 +4,7 @@ from . import VMBaseClass
 from .releases import base_vm_classes as relbase
 from .releases import centos_base_vm_classes as centos_relbase
 
+import os
 import textwrap
 
 
@@ -24,10 +25,6 @@ class Centos70TestSimple(centos_relbase.centos70_xenial, TestSimple):
     __test__ = True
 
 
-class TrustyTestSimple(relbase.trusty, TestSimple):
-    __test__ = True
-
-
 class XenialTestSimple(relbase.xenial, TestSimple):
     __test__ = True
 
@@ -53,6 +50,13 @@ class DiscoTestSimple(relbase.disco, TestSimple):
         self.output_files_exist(["netplan.yaml"])
 
 
+class EoanTestSimple(relbase.eoan, 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"
@@ -109,4 +113,36 @@ class DiscoTestSimpleStorage(relbase.disco, TestSimpleStorage):
         self.output_files_exist(["netplan.yaml"])
 
 
+class EoanTestSimpleStorage(relbase.eoan, 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"
+    extra_disks = []
+    extra_nics = []
+    extra_collect_scripts = [textwrap.dedent("""
+        cd OUTPUT_COLLECT_D
+        cp /etc/netplan/50-cloud-init.yaml netplan.yaml
+
+        exit 0
+        """)]
+
+    def test_no_grub_file_created(self):
+        """ Curtin did not write a grub configuration file. """
+        grub_d_path = self.collect_path('etc_default_grub_d')
+        grub_d_files = os.listdir(grub_d_path)
+        self.assertNotIn('50-curtin-settings.cfg', grub_d_files)
+
+
+class DiscoTestGrubNoDefaults(relbase.disco, 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 f210e7e..51696c2 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -89,14 +89,6 @@ class PreciseHWETUefiTestBasic(relbase.precise_hwe_t, PreciseUefiTestBasic):
     __test__ = False
 
 
-class TrustyUefiTestBasic(relbase.trusty, TestBasicAbs):
-    __test__ = True
-
-
-class TrustyHWEXUefiTestBasic(relbase.trusty_hwe_x, TestBasicAbs):
-    __test__ = True
-
-
 class XenialGAUefiTestBasic(relbase.xenial_ga, TestBasicAbs):
     __test__ = True
 
@@ -121,17 +113,11 @@ class DiscoUefiTestBasic(relbase.disco, TestBasicAbs):
     __test__ = True
 
 
-class Centos70UefiTestBasic4k(centos_relbase.centos70_xenial, TestBasicAbs):
+class EoanUefiTestBasic(relbase.eoan, TestBasicAbs):
     __test__ = True
-    disk_block_size = 4096
 
 
-class TrustyUefiTestBasic4k(relbase.trusty, TestBasicAbs):
-    __test__ = True
-    disk_block_size = 4096
-
-
-class TrustyHWEXUefiTestBasic4k(relbase.trusty_hwe_x, TestBasicAbs):
+class Centos70UefiTestBasic4k(centos_relbase.centos70_xenial, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
 
@@ -155,4 +141,9 @@ class DiscoUefiTestBasic4k(relbase.disco, TestBasicAbs):
     __test__ = True
     disk_block_size = 4096
 
+
+class EoanUefiTestBasic4k(relbase.eoan, TestBasicAbs):
+    __test__ = True
+    disk_block_size = 4096
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_vmtests.py b/tests/vmtests/test_vmtests.py
index 44cd8dc..5e395f0 100644
--- a/tests/vmtests/test_vmtests.py
+++ b/tests/vmtests/test_vmtests.py
@@ -17,7 +17,7 @@ class PsuedoBase(PsuedoVMBaseClass):
     pass
 
 
-class PsuedoTestAllPass(relbase.trusty, PsuedoBase):
+class PsuedoTestAllPass(relbase.bionic, PsuedoBase):
     __test__ = True
     # These boot_results would cause first_boot failure
     # boot_results = {
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index 473c9e3..7ab4f96 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -94,6 +94,10 @@ class DiscoTestZfsRoot(relbase.disco, TestZfsRootAbs):
     __test__ = True
 
 
+class EoanTestZfsRoot(relbase.eoan, TestZfsRootAbs):
+    __test__ = True
+
+
 class TestZfsRootFsTypeAbs(TestZfsRootAbs):
     conf_file = "examples/tests/basic-zfsroot.yaml"
 
@@ -118,3 +122,7 @@ class CosmicTestZfsRootFsType(relbase.cosmic, TestZfsRootFsTypeAbs):
 
 class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):
     __test__ = True
+
+
+class EoanTestZfsRootFsType(relbase.eoan, TestZfsRootFsTypeAbs):
+    __test__ = True
diff --git a/tools/vmtest-system-setup b/tools/vmtest-system-setup
index bc790cb..b9185db 100755
--- a/tools/vmtest-system-setup
+++ b/tools/vmtest-system-setup
@@ -16,6 +16,7 @@ DEPS=(
   make
   net-tools
   python3
+  python3-jsonschema
   python3-nose
   python3-simplestreams
   python3-yaml
diff --git a/tools/xkvm b/tools/xkvm
index e65bf76..9135ac1 100755
--- a/tools/xkvm
+++ b/tools/xkvm
@@ -429,7 +429,7 @@ main() {
     bios_opts=( "${_RET[@]}" )
 
     local out="" fmt="" bus="" unit="" index="" serial="" driver="" devopts=""
-    local busorindex="" driveopts="" cur="" val="" file=""
+    local busorindex="" driveopts="" cur="" val="" file="" wwn=""
     for((i=0;i<${#diskdevs[@]};i++)); do
         cur=${diskdevs[$i]}
         IFS=","; set -- $cur; IFS="$oifs"
@@ -441,6 +441,7 @@ main() {
         unit=""
         index=""
         serial=""
+        wwn=""
         for tok in "$@"; do
             [ "${tok#*=}" = "${tok}" -a -f "${tok}" -a -z "$file" ] && file="$tok"
             val=${tok#*=}
@@ -454,6 +455,7 @@ main() {
                 file=*) file=$val;;
                 fmt=*|format=*) fmt=$val;;
                 serial=*) serial=$val;;
+                wwn=*) wwn=$val;;
                 bus=*) bus=$val;;
                 unit=*) unit=$val;;
                 index=*) index=$val;;
@@ -471,7 +473,12 @@ main() {
             driver="$def_disk_driver"
         fi
         if [ -z "$serial" ]; then
-            serial="${file##*/}"
+            # use filename as serial if not provided a wwn
+            if [ -n "$wwn" ]; then
+                serial="$wwn"
+            else
+                serial="${file##*/}"
+            fi
         fi
 
         # make sure we add either bus= or index=
diff --git a/tox.ini b/tox.ini
index 8e5faf2..3a8e40e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,7 +50,7 @@ commands = {envpython} -m flake8 {posargs:curtin tests/}
 # set basepython because tox 1.6 (trusty) does not support generated environments
 basepython = python3
 deps = {[testenv]deps}
-    pylint==1.8.1
+    pylint==2.3.1
     git+https://git.launchpad.net/simplestreams
 commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}