Merge ~chad.smith/curtin:ubuntu/devel into curtin:ubuntu/devel

[Chad Smith]

Sync new-upstream-snapshot of curtin for release into Cosmic

[Scott Moser (smoser)]

lgtm

review: Approve

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

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

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

review: Approve (continuous-integration)

diff --git a/bin/curtin b/bin/curtin
index 6c4e457..793fbcb 100755
--- a/bin/curtin
+++ b/bin/curtin
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-PY3OR2_MAIN="curtin.commands.main"
+PY3OR2_MAIN="curtin"
 PY3OR2_MCHECK="curtin.deps.check"
 PY3OR2_PYTHONS=${PY3OR2_PYTHONS:-"python3:python"}
 PYTHON=${PY3OR2_PYTHON}
diff --git a/curtin/__main__.py b/curtin/__main__.py
new file mode 100644
index 0000000..5b6aeca
--- /dev/null
+++ b/curtin/__main__.py
@@ -0,0 +1,4 @@
+if __name__ == '__main__':
+    from .commands.main import main
+    import sys
+    sys.exit(main())
diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index a8ee8a6..b49b9d3 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -378,24 +378,28 @@ def stop_all_unused_multipath_devices():
         LOG.warn("Failed to stop multipath devices: %s", e)
 
 
-def rescan_block_devices(warn_on_fail=True):
+def rescan_block_devices(devices=None, warn_on_fail=True):
     """
     run 'blockdev --rereadpt' for all block devices not currently mounted
     """
-    unused = get_unused_blockdev_info()
-    devices = []
-    for devname, data in unused.items():
-        if data.get('RM') == "1":
-            continue
-        if data.get('RO') != "0" or data.get('TYPE') != "disk":
-            continue
-        devices.append(data['device_path'])
+    if not devices:
+        unused = get_unused_blockdev_info()
+        devices = []
+        for devname, data in unused.items():
+            if data.get('RM') == "1":
+                continue
+            if data.get('RO') != "0" or data.get('TYPE') != "disk":
+                continue
+            devices.append(data['device_path'])
 
     if not devices:
         LOG.debug("no devices found to rescan")
         return
 
-    cmd = ['blockdev', '--rereadpt'] + devices
+    # blockdev needs /dev/ parameters, convert if needed
+    cmd = ['blockdev', '--rereadpt'] + [dev if dev.startswith('/dev/')
+                                        else sysfs_to_devpath(dev)
+                                        for dev in devices]
     try:
         util.subp(cmd, capture=True)
     except util.ProcessExecutionError as e:
diff --git a/curtin/block/clear_holders.py b/curtin/block/clear_holders.py
index 20c572b..9d73b28 100644
--- a/curtin/block/clear_holders.py
+++ b/curtin/block/clear_holders.py
@@ -300,6 +300,9 @@ def wipe_superblock(device):
         else:
             raise e
 
+    # gather any partitions
+    partitions = block.get_sysfs_partitions(device)
+
     # release zfs member by exporting the pool
     if block.is_zfs_member(blockdev):
         poolname = zfs.device_to_poolname(blockdev)
@@ -325,6 +328,27 @@ def wipe_superblock(device):
 
     _wipe_superblock(blockdev)
 
+    # if we had partitions, make sure they've been removed
+    if partitions:
+        LOG.debug('%s had partitions, issuing partition reread', device)
+        retries = [.5, .5, 1, 2, 5, 7]
+        for attempt, wait in enumerate(retries):
+            try:
+                # only rereadpt on wiped device
+                block.rescan_block_devices(devices=[blockdev])
+                # may raise IOError, OSError due to wiped partition table
+                curparts = block.get_sysfs_partitions(device)
+                if len(curparts) == 0:
+                    return
+            except (IOError, OSError):
+                if attempt + 1 >= len(retries):
+                    raise
+
+            LOG.debug("%s partitions still present, rereading pt"
+                      " (%s/%s).  sleeping %ss before retry",
+                      device, attempt + 1, len(retries), wait)
+            time.sleep(wait)
+
 
 def _wipe_superblock(blockdev, exclusive=True):
     """ No checks, just call wipe_volume """
@@ -579,8 +603,6 @@ def clear_holders(base_paths, try_preserve=False):
                      dev_info['dev_type'])
             continue
 
-        # scan before we check
-        block.rescan_block_devices(warn_on_fail=False)
         if os.path.exists(dev_info['device']):
             LOG.info("shutdown running on holder type: '%s' syspath: '%s'",
                      dev_info['dev_type'], dev_info['device'])
diff --git a/curtin/block/mkfs.py b/curtin/block/mkfs.py
index a199d05..f39017c 100644
--- a/curtin/block/mkfs.py
+++ b/curtin/block/mkfs.py
@@ -8,7 +8,7 @@ from curtin import block
 
 import string
 import os
-from uuid import uuid1
+from uuid import uuid4
 
 mkfs_commands = {
     "btrfs": "mkfs.btrfs",
@@ -191,7 +191,7 @@ def mkfs(path, fstype, strict=False, label=None, uuid=None, force=False):
 
     # If uuid is not specified, generate one and try to use it
     if uuid is None:
-        uuid = str(uuid1())
+        uuid = str(uuid4())
     cmd.extend(get_flag_mapping("uuid", fs_family, param=uuid, strict=strict))
 
     if fs_family == "fat":
diff --git a/curtin/commands/__main__.py b/curtin/commands/__main__.py
new file mode 100644
index 0000000..41c6d17
--- /dev/null
+++ b/curtin/commands/__main__.py
@@ -0,0 +1,4 @@
+if __name__ == '__main__':
+    from .main import main
+    import sys
+    sys.exit(main())
diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index a514560..f9a5a66 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -679,7 +679,9 @@ def install_missing_packages(cfg, target):
                 needed_packages.add(pkg)
 
     # Filter out ifupdown network packages on netplan enabled systems.
-    if 'ifupdown' not in installed_packages and 'nplan' in installed_packages:
+    has_netplan = ('nplan' in installed_packages or
+                   'netplan.io' in installed_packages)
+    if 'ifupdown' not in installed_packages and has_netplan:
         drops = set(['bridge-utils', 'ifenslave', 'vlan'])
         if needed_packages.union(drops):
             LOG.debug("Skipping install of %s.  Not needed on netplan system.",
diff --git a/curtin/commands/features.py b/curtin/commands/features.py
new file mode 100644
index 0000000..0f6085b
--- /dev/null
+++ b/curtin/commands/features.py
@@ -0,0 +1,20 @@
+# This file is part of curtin. See LICENSE file for copyright and license info.
+"""List the supported feature names to stdout."""
+
+import sys
+from .. import FEATURES
+from . import populate_one_subcmd
+
+CMD_ARGUMENTS = ((tuple()))
+
+
+def features_main(args):
+    sys.stdout.write("\n".join(sorted(FEATURES)) + "\n")
+    sys.exit(0)
+
+
+def POPULATE_SUBCMD(parser):
+    populate_one_subcmd(parser, CMD_ARGUMENTS, features_main)
+    parser.description = __doc__
+
+# vi: ts=4 expandtab syntax=python
diff --git a/curtin/commands/main.py b/curtin/commands/main.py
index 779bb03..bccfc51 100644
--- a/curtin/commands/main.py
+++ b/curtin/commands/main.py
@@ -16,9 +16,9 @@ VERSIONSTR = version.version_string()
 SUB_COMMAND_MODULES = [
     'apply_net', 'apt-config', 'block-attach-iscsi', 'block-detach-iscsi',
     'block-info', 'block-meta', 'block-wipe', 'clear-holders', 'curthooks',
-    'collect-logs', 'extract', 'hook', 'install', 'mkfs', 'in-target',
-    'net-meta', 'pack', 'swap', 'system-install', 'system-upgrade', 'unmount',
-    'version',
+    'collect-logs', 'extract', 'features',
+    'hook', 'install', 'mkfs', 'in-target', 'net-meta', 'pack', 'swap',
+    'system-install', 'system-upgrade', 'unmount', 'version',
 ]
 
 
diff --git a/debian/changelog b/debian/changelog
index dfd5560..8f013e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+curtin (18.1-44-g2b12b8fc-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream snapshot.
+    - Add main so that 'python3 -m curtin' does the right thing.
+    - Add subcommand 'features'.
+    - block: use uuid4 (random) when autogenerating UUIDS for filesystems
+    - vmtests: Increase size of root filesystems.
+    - clear-holders: reread ptable after wiping disks with partitions
+    - vmtest: Skip proposed pocket on dev release when 'proposed' in ADD_REPOS.
+    - tests: remove Ubuntu Artful [Joshua Powers]
+    - vmtests: Let a raised SkipTest go through skip_by_date.
+    - vmtests: Increase root fs to give upgrades to -proposed more space.
+    - vmtest: Order the vmtest_pollinate late_command earlier.
+    - vmtest: always add 'curtin/vmtest' to installed pollinate user_agent.
+    - vmtests: make skip_by_date a decorator that runs and reports.
+    - vmtests: always declare certain attributes and remove redundant tests.
+    - vmtests: Add Cosmic release to tests [Joshua Powers]
+    - vmtests: skip TrustyTestMdadmBcache until 2019-01-22.
+    - tox: use simplestreams from git repository rather than bzr.
+    - document that you can set ptable on raids [Michael Hudson-Doyle]
+    - vmtests: move skip-by date of xfs root and xfs boot out 1 year.
+    - vmtests: network_mtu move fixby date out 4 months from last value
+
+ -- Chad Smith <[e-mail]>  Fri, 10 Aug 2018 09:22:12 -0600
+
 curtin (18.1-25-g9d0e557e-0ubuntu1) cosmic; urgency=medium
 
   * New upstream snapshot.
diff --git a/doc/topics/integration-testing.rst b/doc/topics/integration-testing.rst
index 7753068..6093b55 100644
--- a/doc/topics/integration-testing.rst
+++ b/doc/topics/integration-testing.rst
@@ -314,6 +314,10 @@ Some environment variables affect the running of vmtest
    setting (auto), then a upgrade will be done to make sure to include
    any new packages.
 
+   The string 'proposed' is handled specially.  It will enable the
+   Ubuntu -proposed pocket for non-devel releases.  If you wish to test
+   the -proposed pocket for a devel release, use 'PROPOSED'.
+
 - ``CURTIN_VMTEST_SYSTEM_UPGRADE``: default 'auto'
    The default setting of 'auto' means to do a system upgrade if
    there are additional repos added.  To enable this explicitly, set
diff --git a/doc/topics/storage.rst b/doc/topics/storage.rst
index ca6253c..b28964b 100644
--- a/doc/topics/storage.rst
+++ b/doc/topics/storage.rst
@@ -60,9 +60,9 @@ table. A disk command may contain all or some of the following keys:
 
 **ptable**: *msdos, gpt*
 
-If the ``ptable`` key is present and a valid type of partition table, curtin
-will create an empty partition table of that type on the disk.  At the moment,
-msdos and gpt partition tables are supported.
+If the ``ptable`` key is present and a curtin will create an empty
+partition table of that type on the disk.  Curtin supports msdos and
+gpt partition tables.
 
 **serial**: *<serial number>*
 
@@ -613,6 +613,11 @@ The ``spare_devices`` key specifies a list of the devices that will be used for
 spares in the raid array. Each device must be referenced by ``id`` and the
 device must be previously defined in the storage configuration.  May be empty.
 
+**ptable**: *msdos, gpt*
+
+To partition the array rather than mounting it directly, the
+``ptable`` key must be present and a valid type of partition table,
+i.e. msdos or gpt.
 
 **Config Example**::
 
@@ -801,6 +806,7 @@ Learn by examples.
 - LVM
 - Bcache
 - RAID Boot
+- Partitioned RAID
 - RAID5 + Bcache
 - ZFS Root Simple
 - ZFS Root
@@ -1045,6 +1051,76 @@ RAID Boot
          path: /
          device: md_root
 
+Partitioned RAID
+~~~~~~~~~~~~~~~~
+
+::
+
+  storage:
+    config:
+    - type: disk
+      id: disk-0
+      ptable: gpt
+      path: /dev/vda
+      wipe: superblock
+      grub_device: true
+    - type: disk
+      id: disk-1
+      path: /dev/vdb
+      wipe: superblock
+    - type: disk
+      id: disk-2
+      path: /dev/vdc
+      wipe: superblock
+    - type: partition
+      id: part-0
+      device: disk-0
+      size: 1048576
+      flag: bios_grub
+    - type: partition
+      id: part-1
+      device: disk-0
+      size: 21471690752
+    - id: raid-0
+      type: raid
+      name: md0
+      raidlevel: 1
+      devices: [disk-2, disk-1]
+      ptable: gpt
+    - type: partition
+      id: part-2
+      device: raid-0
+      size: 10737418240
+    - type: partition
+      id: part-3
+      device: raid-0
+      size: 10735321088,
+    - type: format
+      id: fs-0
+      fstype: ext4
+      volume: part-1
+    - type: format
+      id: fs-1
+      fstype: xfs
+      volume: part-2
+    - type: format
+      id: fs-2
+      fstype: ext4
+      volume: part-3
+    - type: mount
+      id: mount-0
+      device: fs-0
+      path: /
+    - type: mount
+      id: mount-1
+      device: fs-1
+      path: /srv
+    - type: mount
+      id: mount-2
+      device: fs-2
+      path: /home
+    version: 1
+
 
 RAID5 + Bcache
 ~~~~~~~~~~~~~~
diff --git a/examples/tests/install_disable_unmount.yaml b/examples/tests/install_disable_unmount.yaml
index d3e583f..c0cd759 100644
--- a/examples/tests/install_disable_unmount.yaml
+++ b/examples/tests/install_disable_unmount.yaml
@@ -14,5 +14,5 @@ post_cmds:
 late_commands:
   01_get_proc_mounts: [sh, -c, *cat_proc_mounts]
   02_write_out_target: [sh, -c, *echo_target_mp]
-  03_unmount_target: [curtin, unmount]
-  04_get_proc_mounts: [cat, /proc/mounts]
+  99a_unmount_target: [curtin, unmount]
+  99b_get_proc_mounts: [cat, /proc/mounts]
diff --git a/examples/tests/mirrorboot-msdos-partition.yaml b/examples/tests/mirrorboot-msdos-partition.yaml
index 1a418fa..2b111a7 100644
--- a/examples/tests/mirrorboot-msdos-partition.yaml
+++ b/examples/tests/mirrorboot-msdos-partition.yaml
@@ -47,7 +47,7 @@ storage:
        name: md0-part1
        number: 1
        offset: 4194304B
-       size: 2GB
+       size: 3GB
        type: partition
        uuid: 4f4fa336-2762-48e4-ae54-9451141665cd
        wipe: superblock
@@ -55,7 +55,7 @@ storage:
        id: md0-part2
        name: md0-part2
        number: 2
-       size: 2GB
+       size: 1.5GB
        type: partition
        uuid: c2d21fd3-3cde-4432-8eab-f08594bbe76e
        wipe: superblock
diff --git a/examples/tests/mirrorboot-uefi.yaml b/examples/tests/mirrorboot-uefi.yaml
index e1f393f..ca55be9 100644
--- a/examples/tests/mirrorboot-uefi.yaml
+++ b/examples/tests/mirrorboot-uefi.yaml
@@ -30,7 +30,7 @@ storage:
     id: sda-part2
     name: sda-part2
     number: 2
-    size: 2G
+    size: 3G
     type: partition
     uuid: 47c97eae-f35d-473f-8f3d-d64161d571f1
     wipe: superblock
@@ -38,7 +38,7 @@ storage:
     id: sda-part3
     name: sda-part3
     number: 3
-    size: 2G
+    size: 1G
     type: partition
     uuid: e3202633-841c-4936-a520-b18d1f7938ea
     wipe: superblock
@@ -56,7 +56,7 @@ storage:
     id: sdb-part2
     name: sdb-part2
     number: 2
-    size: 2G
+    size: 3G
     type: partition
     uuid: a33a83dd-d1bf-4940-bf3e-6d931de85dbc
     wipe: superblock
@@ -72,7 +72,7 @@ storage:
     id: sdb-part3
     name: sdb-part3
     number: 3
-    size: 2G
+    size: 1G
     type: partition
     uuid: 27e29758-fdcf-4c6a-8578-c92f907a8a9d
     wipe: superblock
diff --git a/examples/tests/vmtest_pollinate.yaml b/examples/tests/vmtest_pollinate.yaml
new file mode 100644
index 0000000..e4fac06
--- /dev/null
+++ b/examples/tests/vmtest_pollinate.yaml
@@ -0,0 +1,10 @@
+# this updates pollinate in the installed target to add a vmtest identifier.
+# specifically pollinate's user-agent should contain 'curtin/vmtest'.
+_vmtest_pollinate:
+ - &pvmtest |
+   cfg="/etc/pollinate/add-user-agent"
+   [ -d "${cfg%/*}" ] || exit 0
+   echo curtin/vmtest >> "$cfg"
+
+late_commands:
+  01_vmtest_pollinate: ['curtin', 'in-target', '--', 'sh', '-c', *pvmtest]
diff --git a/tests/unittests/test_clear_holders.py b/tests/unittests/test_clear_holders.py
index ceb5615..6c29171 100644
--- a/tests/unittests/test_clear_holders.py
+++ b/tests/unittests/test_clear_holders.py
@@ -10,7 +10,7 @@ from .helpers import CiTestCase
 
 
 class TestClearHolders(CiTestCase):
-    test_blockdev = '/dev/null'
+    test_blockdev = '/wark/dev/null'
     test_syspath = '/sys/class/block/null'
     remove_retries = [0.2] * 150  # clear_holders defaults to 30 seconds
     example_holders_trees = [
@@ -153,7 +153,7 @@ class TestClearHolders(CiTestCase):
         #
 
         device = self.test_syspath
-        mock_block.sys_block_path.return_value = '/dev/null'
+        mock_block.sys_block_path.return_value = self.test_blockdev
         bcache_cset_uuid = 'c08ae789-a964-46fb-a66e-650f0ae78f94'
 
         mock_os.path.exists.return_value = True
@@ -189,9 +189,8 @@ class TestClearHolders(CiTestCase):
     def test_shutdown_bcache_non_sysfs_device(self, mock_get_bcache, mock_log,
                                               mock_os, mock_util,
                                               mock_get_bcache_block):
-        device = "/dev/fakenull"
         with self.assertRaises(ValueError):
-            clear_holders.shutdown_bcache(device)
+            clear_holders.shutdown_bcache(self.test_blockdev)
 
         self.assertEqual(0, len(mock_get_bcache.call_args_list))
         self.assertEqual(0, len(mock_log.call_args_list))
@@ -208,11 +207,10 @@ class TestClearHolders(CiTestCase):
     def test_shutdown_bcache_no_device(self, mock_get_bcache, mock_log,
                                        mock_os, mock_util,
                                        mock_get_bcache_block, mock_block):
-        device = "/sys/class/block/null"
-        mock_block.sysfs_to_devpath.return_value = '/dev/null'
+        mock_block.sysfs_to_devpath.return_value = self.test_blockdev
         mock_os.path.exists.return_value = False
 
-        clear_holders.shutdown_bcache(device)
+        clear_holders.shutdown_bcache(self.test_syspath)
 
         self.assertEqual(3, len(mock_log.info.call_args_list))
         self.assertEqual(1, len(mock_os.path.exists.call_args_list))
@@ -229,18 +227,17 @@ class TestClearHolders(CiTestCase):
     def test_shutdown_bcache_no_cset(self, mock_get_bcache, mock_log,
                                      mock_os, mock_util,
                                      mock_get_bcache_block, mock_block):
-        device = "/sys/class/block/null"
-        mock_block.sysfs_to_devpath.return_value = '/dev/null'
+        mock_block.sysfs_to_devpath.return_value = self.test_blockdev
         mock_os.path.exists.side_effect = iter([
                 True,   # backing device exists
                 False,  # cset device not present (already removed)
                 True,   # backing device (still) exists
         ])
         mock_get_bcache.return_value = '/sys/fs/bcache/fake'
-        mock_get_bcache_block.return_value = device + '/bcache'
+        mock_get_bcache_block.return_value = self.test_syspath + '/bcache'
         mock_os.path.join.side_effect = os.path.join
 
-        clear_holders.shutdown_bcache(device)
+        clear_holders.shutdown_bcache(self.test_syspath)
 
         self.assertEqual(4, len(mock_log.info.call_args_list))
         self.assertEqual(3, len(mock_os.path.exists.call_args_list))
@@ -249,14 +246,15 @@ class TestClearHolders(CiTestCase):
         self.assertEqual(1, len(mock_util.write_file.call_args_list))
         self.assertEqual(2, len(mock_util.wait_for_removal.call_args_list))
 
-        mock_get_bcache.assert_called_with(device, strict=False)
-        mock_get_bcache_block.assert_called_with(device, strict=False)
-        mock_util.write_file.assert_called_with(device + '/bcache/stop',
-                                                '1', mode=None)
+        mock_get_bcache.assert_called_with(self.test_syspath, strict=False)
+        mock_get_bcache_block.assert_called_with(self.test_syspath,
+                                                 strict=False)
+        mock_util.write_file.assert_called_with(
+            self.test_syspath + '/bcache/stop', '1', mode=None)
         retries = self.remove_retries
         mock_util.wait_for_removal.assert_has_calls([
-            mock.call(device, retries=retries),
-            mock.call(device + '/bcache', retries=retries)])
+            mock.call(self.test_syspath, retries=retries),
+            mock.call(self.test_syspath + '/bcache', retries=retries)])
 
     @mock.patch('curtin.block.clear_holders.block')
     @mock.patch('curtin.block.clear_holders.udev.udevadm_settle')
@@ -271,8 +269,7 @@ class TestClearHolders(CiTestCase):
                                                      mock_get_bcache_block,
                                                      mock_udevadm_settle,
                                                      mock_block):
-        device = "/sys/class/block/null"
-        mock_block.sysfs_to_devpath.return_value = '/dev/null'
+        mock_block.sysfs_to_devpath.return_value = self.test_blockdev
         mock_os.path.exists.side_effect = iter([
                 True,  # backing device exists
                 True,  # cset device not present (already removed)
@@ -280,10 +277,10 @@ class TestClearHolders(CiTestCase):
         ])
         cset = '/sys/fs/bcache/fake'
         mock_get_bcache.return_value = cset
-        mock_get_bcache_block.return_value = device + '/bcache'
+        mock_get_bcache_block.return_value = self.test_syspath + '/bcache'
         mock_os.path.join.side_effect = os.path.join
 
-        clear_holders.shutdown_bcache(device)
+        clear_holders.shutdown_bcache(self.test_syspath)
 
         self.assertEqual(4, len(mock_log.info.call_args_list))
         self.assertEqual(3, len(mock_os.path.exists.call_args_list))
@@ -292,14 +289,15 @@ class TestClearHolders(CiTestCase):
         self.assertEqual(2, len(mock_util.write_file.call_args_list))
         self.assertEqual(3, len(mock_util.wait_for_removal.call_args_list))
 
-        mock_get_bcache.assert_called_with(device, strict=False)
-        mock_get_bcache_block.assert_called_with(device, strict=False)
+        mock_get_bcache.assert_called_with(self.test_syspath, strict=False)
+        mock_get_bcache_block.assert_called_with(self.test_syspath,
+                                                 strict=False)
         mock_util.write_file.assert_has_calls([
             mock.call(cset + '/stop', '1', mode=None),
-            mock.call(device + '/bcache/stop', '1', mode=None)])
+            mock.call(self.test_syspath + '/bcache/stop', '1', mode=None)])
         mock_util.wait_for_removal.assert_has_calls([
             mock.call(cset, retries=self.remove_retries),
-            mock.call(device, retries=self.remove_retries)
+            mock.call(self.test_syspath, retries=self.remove_retries)
         ])
 
     @mock.patch('curtin.block.clear_holders.block')
@@ -315,8 +313,7 @@ class TestClearHolders(CiTestCase):
                                                     mock_get_bcache_block,
                                                     mock_udevadm_settle,
                                                     mock_block):
-        device = "/sys/class/block/null"
-        mock_block.sysfs_to_devpath.return_value = '/dev/null'
+        mock_block.sysfs_to_devpath.return_value = self.test_blockdev
         mock_os.path.exists.side_effect = iter([
                 True,   # backing device exists
                 True,   # cset device not present (already removed)
@@ -324,10 +321,10 @@ class TestClearHolders(CiTestCase):
         ])
         cset = '/sys/fs/bcache/fake'
         mock_get_bcache.return_value = cset
-        mock_get_bcache_block.return_value = device + '/bcache'
+        mock_get_bcache_block.return_value = self.test_syspath + '/bcache'
         mock_os.path.join.side_effect = os.path.join
 
-        clear_holders.shutdown_bcache(device)
+        clear_holders.shutdown_bcache(self.test_syspath)
 
         self.assertEqual(4, len(mock_log.info.call_args_list))
         self.assertEqual(3, len(mock_os.path.exists.call_args_list))
@@ -336,7 +333,7 @@ class TestClearHolders(CiTestCase):
         self.assertEqual(1, len(mock_util.write_file.call_args_list))
         self.assertEqual(1, len(mock_util.wait_for_removal.call_args_list))
 
-        mock_get_bcache.assert_called_with(device, strict=False)
+        mock_get_bcache.assert_called_with(self.test_syspath, strict=False)
         mock_util.write_file.assert_has_calls([
             mock.call(cset + '/stop', '1', mode=None),
         ])
@@ -361,8 +358,7 @@ class TestClearHolders(CiTestCase):
                                                     mock_wipe,
                                                     mock_block):
         """Test writes sysfs write failures pass if file not present"""
-        device = "/sys/class/block/null"
-        mock_block.sysfs_to_devpath.return_value = '/dev/null'
+        mock_block.sysfs_to_devpath.return_value = self.test_blockdev
         mock_os.path.exists.side_effect = iter([
                 True,   # backing device exists
                 True,   # cset device not present (already removed)
@@ -371,14 +367,14 @@ class TestClearHolders(CiTestCase):
         ])
         cset = '/sys/fs/bcache/fake'
         mock_get_bcache.return_value = cset
-        mock_get_bcache_block.return_value = device + '/bcache'
+        mock_get_bcache_block.return_value = self.test_syspath + '/bcache'
         mock_os.path.join.side_effect = os.path.join
 
         # make writes to sysfs fail
         mock_util.write_file.side_effect = IOError(errno.ENOENT,
                                                    "File not found")
 
-        clear_holders.shutdown_bcache(device)
+        clear_holders.shutdown_bcache(self.test_syspath)
 
         self.assertEqual(4, len(mock_log.info.call_args_list))
         self.assertEqual(3, len(mock_os.path.exists.call_args_list))
@@ -387,7 +383,7 @@ class TestClearHolders(CiTestCase):
         self.assertEqual(1, len(mock_util.write_file.call_args_list))
         self.assertEqual(1, len(mock_util.wait_for_removal.call_args_list))
 
-        mock_get_bcache.assert_called_with(device, strict=False)
+        mock_get_bcache.assert_called_with(self.test_syspath, strict=False)
         mock_util.write_file.assert_has_calls([
             mock.call(cset + '/stop', '1', mode=None),
         ])
@@ -528,10 +524,15 @@ class TestClearHolders(CiTestCase):
         self.assertTrue(mock_log.debug.called)
         self.assertTrue(mock_log.critical.called)
 
+    @mock.patch('curtin.block.clear_holders.is_swap_device')
+    @mock.patch('curtin.block.clear_holders.os.path.exists')
     @mock.patch('curtin.block.clear_holders.LOG')
     @mock.patch('curtin.block.clear_holders.block')
-    def test_clear_holders_wipe_superblock(self, mock_block, mock_log):
+    def test_clear_holders_wipe_superblock(self, mock_block, mock_log,
+                                           mock_os_path, mock_swap):
         """test clear_holders.wipe_superblock handles errors right"""
+        mock_swap.return_value = False
+        mock_os_path.return_value = False
         mock_block.sysfs_to_devpath.return_value = self.test_blockdev
         mock_block.is_extended_partition.return_value = True
         clear_holders.wipe_superblock(self.test_syspath)
@@ -543,12 +544,14 @@ class TestClearHolders(CiTestCase):
         mock_block.wipe_volume.assert_called_with(
             self.test_blockdev, exclusive=True, mode='superblock')
 
+    @mock.patch('curtin.block.clear_holders.is_swap_device')
     @mock.patch('curtin.block.clear_holders.zfs')
     @mock.patch('curtin.block.clear_holders.LOG')
     @mock.patch('curtin.block.clear_holders.block')
     def test_clear_holders_wipe_superblock_zfs(self, mock_block, mock_log,
-                                               mock_zfs):
+                                               mock_zfs, mock_swap):
         """test clear_holders.wipe_superblock handles zfs member"""
+        mock_swap.return_value = False
         mock_block.sysfs_to_devpath.return_value = self.test_blockdev
         mock_block.is_extended_partition.return_value = True
         clear_holders.wipe_superblock(self.test_syspath)
@@ -563,6 +566,59 @@ class TestClearHolders(CiTestCase):
         mock_block.wipe_volume.assert_called_with(
             self.test_blockdev, exclusive=True, mode='superblock')
 
+    @mock.patch('curtin.block.clear_holders.is_swap_device')
+    @mock.patch('curtin.block.clear_holders.time')
+    @mock.patch('curtin.block.clear_holders.LOG')
+    @mock.patch('curtin.block.clear_holders.block')
+    def test_clear_holders_wipe_superblock_rereads_pt(self, mock_block,
+                                                      mock_log, m_time,
+                                                      mock_swap):
+        """test clear_holders.wipe_superblock re-reads partition table"""
+        mock_swap.return_value = False
+        mock_block.sysfs_to_devpath.return_value = self.test_blockdev
+        mock_block.is_extended_partition.return_value = False
+        mock_block.is_zfs_member.return_value = False
+        mock_block.get_sysfs_partitions.side_effect = iter([
+            ['p1', 'p2'],  # has partitions before wipe
+            ['p1', 'p2'],  # still has partitions after wipe
+            [],  # partitions are now gone
+        ])
+        clear_holders.wipe_superblock(self.test_syspath)
+        mock_block.sysfs_to_devpath.assert_called_with(self.test_syspath)
+        mock_block.wipe_volume.assert_called_with(
+            self.test_blockdev, exclusive=True, mode='superblock')
+        mock_block.get_sysfs_partitions.assert_has_calls(
+            [mock.call(self.test_syspath)] * 3)
+        mock_block.rescan_block_devices.assert_has_calls(
+            [mock.call(devices=[self.test_blockdev])] * 2)
+
+    @mock.patch('curtin.block.clear_holders.is_swap_device')
+    @mock.patch('curtin.block.clear_holders.time')
+    @mock.patch('curtin.block.clear_holders.LOG')
+    @mock.patch('curtin.block.clear_holders.block')
+    def test_clear_holders_wipe_superblock_rereads_pt_oserr(self, mock_block,
+                                                            mock_log, m_time,
+                                                            mock_swap):
+        """test clear_holders.wipe_superblock re-reads ptable handles oserr"""
+        mock_swap.return_value = False
+        mock_block.sysfs_to_devpath.return_value = self.test_blockdev
+        mock_block.is_extended_partition.return_value = False
+        mock_block.is_zfs_member.return_value = False
+        mock_block.get_sysfs_partitions.side_effect = iter([
+            ['p1', 'p2'],  # has partitions before wipe
+            OSError('No sysfs path for partition'),
+            [],  # partitions are now gone
+        ])
+        clear_holders.wipe_superblock(self.test_syspath)
+        mock_block.sysfs_to_devpath.assert_called_with(self.test_syspath)
+        mock_block.wipe_volume.assert_called_with(
+            self.test_blockdev, exclusive=True, mode='superblock')
+        mock_block.get_sysfs_partitions.assert_has_calls(
+            [mock.call(self.test_syspath)] * 3)
+        mock_block.rescan_block_devices.assert_has_calls(
+            [mock.call(devices=[self.test_blockdev])] * 2)
+        self.assertEqual(1, m_time.sleep.call_count)
+
     @mock.patch('curtin.block.clear_holders.LOG')
     @mock.patch('curtin.block.clear_holders.block')
     @mock.patch('curtin.block.clear_holders.os')
@@ -716,7 +772,7 @@ class TestClearHolders(CiTestCase):
     def test_assert_clear(self, mock_gen_holders_tree, mock_syspath):
         mock_gen_holders_tree.return_value = self.example_holders_trees[0][0]
         mock_syspath.side_effect = lambda x: x
-        device = '/dev/null'
+        device = self.test_blockdev
         with self.assertRaises(OSError):
             clear_holders.assert_clear(device)
             mock_gen_holders_tree.assert_called_with(device)
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 0c3d17e..68b7442 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -26,6 +26,7 @@ from .image_sync import query as imagesync_query
 from .image_sync import mirror as imagesync_mirror
 from .image_sync import (IMAGE_SRC_URL, IMAGE_DIR, ITEM_NAME_FILTERS)
 from .helpers import check_call, TimeoutExpired, ip_a_to_dict
+from functools import wraps
 from unittest import TestCase, SkipTest
 
 try:
@@ -55,6 +56,7 @@ SYSTEM_UPGRADE = os.environ.get("CURTIN_VMTEST_SYSTEM_UPGRADE", "auto")
 
 
 _UNSUPPORTED_UBUNTU = None
+_DEVEL_UBUNTU = None
 
 _TOPDIR = None
 
@@ -354,6 +356,7 @@ def skip_if_flag(flag):
     def decorator(func):
         """the name test_wrapper below has to start with test, or nose's
            filter will not run it."""
+        @wraps(func)
         def test_wrapper(self, *args, **kwargs):
             val = getattr(self, flag, None)
             if val:
@@ -364,6 +367,132 @@ def skip_if_flag(flag):
     return decorator
 
 
+def skip_by_date(bugnum, fixby, removeby=None, skips=None, install=True):
+    """A decorator to skip a test or test class based on current date.
+
+    @param bugnum: A bug number with which to identify the action.
+    @param fixby: string: A date string in the format of YYYY-MM-DD
+        tuple (YYYY,MM,DD).  Raises SkipTest with testcase results until
+        the current date is >= fixby value.
+    @param removeby: string: A date string in the format of YYYY-MM-DD
+        or (YYYY,MM,DD).  Raises RuntimeError with testcase results
+        if current date is >= removeby value.
+        Default value is 3 weeks past fixby value.
+    @param skips: list of test cases (string method names) to be skipped.
+        If None, all class testcases will be skipped per evaluation of
+        fixby and removeby params.  This is ignored when decorating a method.
+        Example skips=["test_test1", "test_test2"]
+    @param install: boolean: When True, setUpClass raises skipTest
+        exception while "today" < "fixby" date.  Useful for handling
+        testcases where the install or boot would hang.
+        install parameter is ignored when decorating a method."""
+    def as_dtdate(date):
+        if not isinstance(date, str):
+            return date
+        return datetime.date(*map(int, date.split("-")))
+
+    def as_str(dtdate):
+        return "%s-%02d-%02d" % (dtdate.year, dtdate.month, dtdate.day)
+
+    d_today = datetime.date.today()
+    d_fixby = as_dtdate(fixby)
+    if removeby is None:
+        # give 3 weeks by default.
+        d_removeby = d_fixby + datetime.timedelta(21)
+    else:
+        d_removeby = as_dtdate(removeby)
+
+    envname = 'CURTIN_VMTEST_SKIP_BY_DATE_BUGS'
+    envval = os.environ.get(envname, "")
+    skip_bugs = envval.replace(",", " ").split()
+    _setUpClass = "setUpClass"
+
+    def decorator(test):
+        def decorate_callable(mycallable, classname=test.__name__):
+            funcname = mycallable.__name__
+            name = '.'.join((classname, funcname))
+            bmsg = ("skip_by_date({name}) LP: #{bug} "
+                    "fixby={fixby} removeby={removeby}: ".format(
+                        name=name, bug=bugnum,
+                        fixby=as_str(d_fixby), removeby=as_str(d_removeby)))
+
+            @wraps(mycallable)
+            def wrapper(*args, **kwargs):
+                skip_reason = None
+                if "*" in skip_bugs or bugnum in skip_bugs:
+                    skip_reason = "skip per %s=%s" % (envname, envval)
+                elif (funcname == _setUpClass and
+                      (not install and d_today < d_fixby)):
+                    skip_reason = "skip per install=%s" % install
+
+                if skip_reason:
+                    logger.info(bmsg + skip_reason)
+                    raise SkipTest(bmsg + skip_reason)
+
+                if d_today < d_fixby:
+                    tmsg = "NOT_YET_FIXBY"
+                elif d_today > d_removeby:
+                    tmsg = "REMOVE_WORKAROUND"
+                else:
+                    tmsg = "PAST_FIXBY"
+
+                if funcname == _setUpClass:
+                    logger.info(bmsg + "Running test (%s)", tmsg)
+
+                exc = None
+                try:
+                    mycallable(*args, **kwargs)
+                except SkipTest:
+                    raise
+                except Exception as e:
+                    exc = e
+
+                if exc is None:
+                    result = "Passed."
+                elif isinstance(exc, SkipTest):
+                    result = "Skipped: %s" % exc
+                else:
+                    result = "Failed: %s" % exc
+
+                msg = (bmsg + "(%s)" % tmsg + " " + result)
+
+                logger.info(msg)
+                if d_today < d_fixby:
+                    if funcname != _setUpClass:
+                        raise SkipTest(msg)
+                else:
+                    # Expected fixed.
+                    if d_today > d_removeby:
+                        raise RuntimeError(msg)
+                    elif exc:
+                        raise RuntimeError(msg)
+
+            return wrapper
+
+        def decorate_test_methods(klass):
+            for attr in dir(klass):
+                attr_value = getattr(klass, attr)
+                if not hasattr(attr_value, "__call__"):
+                    continue
+
+                if attr != _setUpClass:
+                    if not attr.startswith('test_'):
+                        continue
+                    elif not (skips is None or attr in skips):
+                        continue
+
+                setattr(klass, attr,
+                        decorate_callable(attr_value,
+                                          classname=klass.__name__))
+            return klass
+
+        if isinstance(test, (type,)):
+            return decorate_test_methods(klass=test)
+        return decorate_callable(test)
+
+    return decorator
+
+
 class VMBaseClass(TestCase):
     __test__ = False
     expected_failure = False
@@ -450,8 +579,8 @@ class VMBaseClass(TestCase):
         else:
             target_img_verstr, target_ftypes = get_images(
                 IMAGE_SRC_URL, IMAGE_DIR,
-                cls.target_distro if cls.target_distro else cls.distro,
-                cls.target_release if cls.target_release else cls.release,
+                cls.target_distro,
+                cls.target_release,
                 cls.arch, subarch=cls.subarch if cls.subarch else None,
                 kflavor=cls.kflavor if cls.kflavor else None,
                 krel=cls.target_krel, sync=CURTIN_VMTEST_IMAGE_SYNC,
@@ -566,61 +695,6 @@ class VMBaseClass(TestCase):
         return disks
 
     @classmethod
-    def skip_by_date(cls, bugnum, fixby, removeby=None,
-                     release=None, name=None):
-        """Raise SkipTest with bug message until 'fixby'.
-           Raise RutimeError after removeby.
-           fixby and removeby support string (2018-01-01) or tuple(2018,01,01)
-           removeby defaults to 3 weeks after fixby.
-           """
-        def as_dtdate(date):
-            if not isinstance(date, str):
-                return date
-            return datetime.date(*map(int, date.split("-")))
-
-        def as_str(dtdate):
-            return "%s-%02d-%02d" % (dtdate.year, dtdate.month, dtdate.day)
-
-        if name is None:
-            name = cls.__name__
-
-        if release is None:
-            release = cls.release
-
-        d_today = datetime.date.today()
-        d_fixby = as_dtdate(fixby)
-        if removeby is None:
-            # give 3 weeks by default.
-            d_removeby = d_fixby + datetime.timedelta(21)
-        else:
-            d_removeby = as_dtdate(removeby)
-
-        bmsg = ("[{name}/{rel}] skip_by_date LP: #{bug} "
-                "fixby={fixby} removeby={removeby}: ".format(
-                    name=name, rel=release, bug=bugnum,
-                    fixby=as_str(d_fixby), removeby=as_str(d_removeby)))
-
-        envname = 'CURTIN_VMTEST_SKIP_BY_DATE_BUGS'
-        envval = os.environ.get(envname, "")
-        skip_bugs = envval.replace(",", " ").split()
-
-        result = None
-        msg = bmsg + "Not skipping."
-        if "*" in skip_bugs or bugnum in skip_bugs:
-            msg = bmsg + "skip per %s=%s" % (envname, envval)
-            result = SkipTest
-        elif d_today < d_fixby:
-            msg = bmsg + "skip (today < fixby)"
-            result = SkipTest
-        elif d_today > d_removeby:
-            msg = bmsg + "Remove workaround."
-            result = RuntimeError
-
-        logger.info(msg)
-        if result:
-            raise result(msg)
-
-    @classmethod
     def get_config_smp(cls):
         """Get number of cpus to use for guest"""
 
@@ -670,6 +744,12 @@ class VMBaseClass(TestCase):
         return {'kernel': {'fallback-package': package}}
 
     @classmethod
+    def skip_by_date(cls, *args, **kwargs):
+        """skip_by_date wrapper. this way other modules do not have
+        to add an import of skip_by_date to start skipping."""
+        return skip_by_date(*args, **kwargs)
+
+    @classmethod
     def setUpClass(cls):
         # initialize global logger with class name to help make sense of
         # parallel vmtest runs which intermingle output.
@@ -677,6 +757,13 @@ class VMBaseClass(TestCase):
         logger = _initialize_logging(name=cls.__name__)
         cls.logger = logger
 
+        req_attrs = ('target_distro', 'target_release', 'release', 'distro')
+        missing = [a for a in req_attrs if not getattr(cls, a)]
+        if missing:
+            raise ValueError(
+                "Class %s does not have required attrs set: %s" %
+                (cls.__name__, missing))
+
         if is_unsupported_ubuntu(cls.release):
             raise SkipTest('"%s" is unsupported release.' % cls.release)
 
@@ -687,7 +774,14 @@ class VMBaseClass(TestCase):
             raise SkipTest(reason)
 
         setup_start = time.time()
-        logger.info('Starting setup for testclass: {}'.format(cls.__name__))
+        logger.info(
+            ('Starting setup for testclass: {__name__} '
+             '({distro}/{release} -> '
+             '{target_distro}/{target_release})').format(
+                **{k: getattr(cls, k)
+                   for k in ('__name__', 'distro', 'release',
+                             'target_distro', 'target_release')}))
+
         # set up tempdir
         cls.td = TempDir(
             name=cls.__name__,
@@ -823,7 +917,7 @@ class VMBaseClass(TestCase):
         disks.extend(cls.build_iscsi_disks())
 
         # proxy config
-        configs = [cls.conf_file]
+        configs = [cls.conf_file, 'examples/tests/vmtest_pollinate.yaml']
         cls.proxy = get_apt_proxy()
         if cls.proxy is not None and not cls.td.restored:
             proxy_config = os.path.join(cls.td.install, 'proxy.cfg')
@@ -864,14 +958,19 @@ class VMBaseClass(TestCase):
         system_upgrade = SYSTEM_UPGRADE
         upgrade_packages = UPGRADE_PACKAGES
         if add_repos:
-            # enable if user has set a value here
-            if system_upgrade == "auto":
-                system_upgrade = True
-            logger.info('Adding apt repositories: %s', add_repos)
-            repo_cfg = os.path.join(cls.td.install, 'add_repos.cfg')
-            util.write_file(repo_cfg,
-                            generate_repo_config(add_repos.split(",")))
-            configs.append(repo_cfg)
+            cfg_repos = generate_repo_config(add_repos.split(","),
+                                             release=cls.target_release)
+            if cfg_repos:
+                logger.info('Adding apt repositories: %s', add_repos)
+                # enable if user has set a value here
+                if system_upgrade == "auto":
+                    system_upgrade = True
+                repo_cfg = os.path.join(cls.td.install, 'add_repos.cfg')
+                util.write_file(repo_cfg, cfg_repos)
+                configs.append(repo_cfg)
+            else:
+                logger.info("add_repos=%s processed to empty config.",
+                            add_repos)
         elif system_upgrade == "auto":
             system_upgrade = False
 
@@ -1146,7 +1245,7 @@ class VMBaseClass(TestCase):
         """Return install uri and a list of files needed to be published."""
         # if release (install environment) is the same as target
         # target (thing to install) then install via cp://
-        if cls.target_release in (None, cls.release):
+        if cls.target_release == cls.release:
             install_src = "cp:///media/root-ro"
             return install_src, []
 
@@ -1339,7 +1438,7 @@ class VMBaseClass(TestCase):
 
     @skip_if_flag('expected_failure')
     def test_dname(self, disk_to_check=None):
-        if "trusty" in [self.release, self.target_release]:
+        if self.target_release == "trusty":
             raise SkipTest(
                 "(LP: #1523037): dname does not work on trusty kernels")
 
@@ -1393,7 +1492,7 @@ class VMBaseClass(TestCase):
     def test_installed_correct_kernel_package(self):
         """ Test curtin installs the correct kernel package.  """
         # target_distro is set for non-ubuntu targets
-        if self.target_distro is not None:
+        if self.target_distro != "ubuntu":
             raise SkipTest("Can't check non-ubuntu kernel packages")
 
         kpackage = self.get_kernel_package()
@@ -1849,7 +1948,25 @@ def is_unsupported_ubuntu(release):
     return release in _UNSUPPORTED_UBUNTU
 
 
-def generate_repo_config(repos):
+def is_devel_release(release):
+    global _DEVEL_UBUNTU
+    if _DEVEL_UBUNTU is None:
+        udi = 'ubuntu-distro-info'
+        env = os.environ.get('_DEVEL_UBUNTU')
+        if env:
+            # allow it to be , or " " separated.
+            _DEVEL_UBUNTU = env.replace(",", " ").split()
+        elif util.which(udi):
+            _DEVEL_UBUNTU = util.subp(
+                [udi, '--devel'], capture=True)[0].splitlines()
+        else:
+            # no way to tell.
+            _DEVEL_UBUNTU = []
+
+    return release in _DEVEL_UBUNTU
+
+
+def generate_repo_config(repos, release=None):
     """Generate apt yaml configuration to add specified repositories.
 
     @param repos: A list of add-apt-repository strings.
@@ -1857,8 +1974,19 @@ def generate_repo_config(repos):
                   pocket of a particular release.
     @returns: string:  A yaml string
     """
-    sources = {"add_repos_%02d" % idx: {'source': v}
-               for idx, v in enumerate(repos)}
+    sources = {}
+    for idx, v in enumerate(repos):
+        if v == 'proposed' and is_devel_release(release):
+            # lower case 'proposed' is magically handled by apt repo
+            # processing. But dev release's -proposed is "known broken".
+            # if you want to test development release, then use 'PROPOSED'.
+            continue
+        if v == 'PROPOSED':
+            v = 'proposed'
+        sources['add_repos_%02d' % idx] = {'source': v}
+    if not sources:
+        return None
+
     return yaml.dump({'apt': {'sources': sources}})
 
 
diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index 18a5e75..02cbfe5 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -11,6 +11,7 @@ class _ReleaseBase(object):
 class _UbuntuBase(_ReleaseBase):
     distro = "ubuntu"
     kflavor = "generic"
+    target_distro = "ubuntu"
 
 
 class _CentosFromUbuntuBase(_UbuntuBase):
@@ -39,6 +40,7 @@ class _UbuntuCore16FromXenialBase(_UbuntuCoreUbuntuBase):
     release = "xenial"
     # release for target
     target_release = "ubuntu-core-16"
+    target_distro = "ubuntu-core"
 
 
 class _Centos66FromXenialBase(_CentosFromUbuntuBase):
@@ -59,59 +61,56 @@ class _PreciseHWET(_PreciseBase):
 
 class _TrustyBase(_UbuntuBase):
     release = "trusty"
+    target_release = "trusty"
 
 
-class _TrustyHWEU(_UbuntuBase):
-    release = "trusty"
+class _TrustyHWEU(_TrustyBase):
     krel = "utopic"
 
 
-class _TrustyHWEV(_UbuntuBase):
-    release = "trusty"
+class _TrustyHWEV(_TrustyBase):
     krel = "vivid"
 
 
-class _TrustyHWEW(_UbuntuBase):
-    release = "trusty"
+class _TrustyHWEW(_TrustyBase):
     krel = "wily"
 
 
-class _TrustyHWEX(_UbuntuBase):
-    release = "trusty"
+class _TrustyHWEX(_TrustyBase):
     krel = "xenial"
 
 
-class _TrustyFromXenial(_UbuntuBase):
+class _TrustyFromXenial(_TrustyBase):
     release = "xenial"
     target_release = "trusty"
 
 
 class _XenialBase(_UbuntuBase):
     release = "xenial"
+    target_release = "xenial"
     subarch = "ga-16.04"
 
 
-class _XenialGA(_UbuntuBase):
-    release = "xenial"
+class _XenialGA(_XenialBase):
     subarch = "ga-16.04"
 
 
-class _XenialHWE(_UbuntuBase):
-    release = "xenial"
+class _XenialHWE(_XenialBase):
     subarch = "hwe-16.04"
 
 
-class _XenialEdge(_UbuntuBase):
-    release = "xenial"
+class _XenialEdge(_XenialBase):
     subarch = "hwe-16.04-edge"
 
 
-class _ArtfulBase(_UbuntuBase):
-    release = "artful"
-
-
 class _BionicBase(_UbuntuBase):
     release = "bionic"
+    target_release = "bionic"
+
+
+class _CosmicBase(_UbuntuBase):
+    release = "cosmic"
+    target_release = "cosmic"
 
 
 class _Releases(object):
@@ -127,8 +126,8 @@ class _Releases(object):
     xenial_ga = _XenialGA
     xenial_hwe = _XenialHWE
     xenial_edge = _XenialEdge
-    artful = _ArtfulBase
     bionic = _BionicBase
+    cosmic = _CosmicBase
 
 
 class _CentosReleases(object):
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index 2c135c4..efd04f3 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -57,11 +57,11 @@ class XenialTestAptConfigCMDCMD(relbase.xenial, TestAptConfigCMD):
     __test__ = True
 
 
-class ArtfulTestAptConfigCMDCMD(relbase.artful, TestAptConfigCMD):
+class BionicTestAptConfigCMDCMD(relbase.bionic, TestAptConfigCMD):
     __test__ = True
 
 
-class BionicTestAptConfigCMDCMD(relbase.bionic, TestAptConfigCMD):
+class CosmicTestAptConfigCMDCMD(relbase.cosmic, TestAptConfigCMD):
     __test__ = True
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 2e47cb6..01ffc89 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -23,8 +23,13 @@ class TestBasicAbs(VMBaseClass):
         blkid -o export /dev/vda > blkid_output_vda
         blkid -o export /dev/vda1 > blkid_output_vda1
         blkid -o export /dev/vda2 > blkid_output_vda2
-        f="btrfs_uuid_vdd"
-        btrfs-debug-tree -r /dev/vdd | awk '/^uuid/ {print $2}' | grep "-" > $f
+        dev="/dev/vdd"; f="btrfs_uuid_${dev#/dev/*}";
+        if command -v btrfs-debug-tree >/dev/null; then
+           btrfs-debug-tree -r $dev | awk '/^uuid/ {print $2}' | grep "-"
+        else
+           btrfs inspect-internal dump-super $dev |
+               awk '/^dev_item.fsid/ {print $2}'
+        fi > $f
         cat /proc/partitions > proc_partitions
         ls -al /dev/disk/by-uuid/ > ls_uuid
         cat /etc/fstab > fstab
@@ -60,7 +65,7 @@ class TestBasicAbs(VMBaseClass):
              "root/curtin-install.log", "root/curtin-install-cfg.yaml"])
 
     def test_ptable(self, disk_to_check=None):
-        if "trusty" in [self.release, self.target_release]:
+        if self.target_release == "trusty":
             raise SkipTest("No PTTYPE blkid output on trusty")
 
         blkid_info = self.get_blkid_data("blkid_output_vda")
@@ -169,11 +174,11 @@ class XenialEdgeTestBasic(relbase.xenial_edge, TestBasicAbs):
     __test__ = True
 
 
-class ArtfulTestBasic(relbase.artful, TestBasicAbs):
+class BionicTestBasic(relbase.bionic, TestBasicAbs):
     __test__ = True
 
 
-class BionicTestBasic(relbase.bionic, TestBasicAbs):
+class CosmicTestBasic(relbase.cosmic, TestBasicAbs):
     __test__ = True
 
 
@@ -187,8 +192,13 @@ class TestBasicScsiAbs(TestBasicAbs):
         blkid -o export /dev/sda > blkid_output_sda
         blkid -o export /dev/sda1 > blkid_output_sda1
         blkid -o export /dev/sda2 > blkid_output_sda2
-        f="btrfs_uuid_sdc"
-        btrfs-debug-tree -r /dev/sdc | awk '/^uuid/ {print $2}' | grep "-" > $f
+        dev="/dev/sdc"; f="btrfs_uuid_${dev#/dev/*}";
+        if command -v btrfs-debug-tree >/dev/null; then
+           btrfs-debug-tree -r $dev | awk '/^uuid/ {print $2}' | grep "-"
+        else
+           btrfs inspect-internal dump-super $dev |
+               awk '/^dev_item.fsid/ {print $2}'
+        fi > $f
         cat /proc/partitions > proc_partitions
         ls -al /dev/disk/by-uuid/ > ls_uuid
         ls -al /dev/disk/by-id/ > ls_disk_id
@@ -210,7 +220,7 @@ class TestBasicScsiAbs(TestBasicAbs):
              "ls_disk_id", "proc_partitions"])
 
     def test_ptable(self):
-        if "trusty" in [self.release, self.target_release]:
+        if self.target_release == "trusty":
             raise SkipTest("No PTTYPE blkid output on trusty")
 
         blkid_info = self.get_blkid_data("blkid_output_sda")
@@ -289,11 +299,11 @@ class XenialEdgeTestScsiBasic(relbase.xenial_edge, TestBasicScsiAbs):
     __test__ = True
 
 
-class ArtfulTestScsiBasic(relbase.artful, TestBasicScsiAbs):
+class BionicTestScsiBasic(relbase.bionic, TestBasicScsiAbs):
     __test__ = True
 
 
-class BionicTestScsiBasic(relbase.bionic, TestBasicScsiAbs):
+class CosmicTestScsiBasic(relbase.cosmic, TestBasicScsiAbs):
     __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 1844bc6..4989c8e 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -65,11 +65,11 @@ class XenialEdgeBcacheBasic(relbase.xenial_edge, TestBcacheBasic):
     __test__ = True
 
 
-class ArtfulBcacheBasic(relbase.artful, TestBcacheBasic):
+class BionicBcacheBasic(relbase.bionic, TestBcacheBasic):
     __test__ = True
 
 
-class BionicBcacheBasic(relbase.bionic, TestBcacheBasic):
+class CosmicBcacheBasic(relbase.cosmic, 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 bb1b32f..bc0f1e0 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -15,11 +15,11 @@ class XenialTestBcacheBug1718699(relbase.xenial, TestBcacheBug1718699):
     __test__ = True
 
 
-class ArtfulTestBcacheBug1718699(relbase.artful, TestBcacheBug1718699):
+class BionicTestBcacheBug1718699(relbase.bionic, TestBcacheBug1718699):
     __test__ = True
 
 
-class BionicTestBcacheBug1718699(relbase.bionic, TestBcacheBug1718699):
+class CosmicTestBcacheBug1718699(relbase.cosmic, TestBcacheBug1718699):
     __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 423cc1e..3e41717 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -225,4 +225,8 @@ class BionicTestFsBattery(relbase.bionic, TestFsBattery):
     __test__ = True
 
 
+class CosmicTestFsBattery(relbase.cosmic, TestFsBattery):
+    __test__ = True
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index bddd78c..1ac9660 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -65,11 +65,11 @@ class XenialEdgeTestIscsiBasic(relbase.xenial_edge, TestBasicIscsiAbs):
     __test__ = True
 
 
-class ArtfulTestIscsiBasic(relbase.artful, TestBasicIscsiAbs):
+class BionicTestIscsiBasic(relbase.bionic, TestBasicIscsiAbs):
     __test__ = True
 
 
-class BionicTestIscsiBasic(relbase.bionic, TestBasicIscsiAbs):
+class CosmicTestIscsiBasic(relbase.cosmic, 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 35ece6d..ad34d52 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -35,11 +35,11 @@ class XenialTestJournaldReporter(relbase.xenial, TestJournaldReporter):
     __test__ = True
 
 
-class ArtfulTestJournaldReporter(relbase.artful, TestJournaldReporter):
+class BionicTestJournaldReporter(relbase.bionic, TestJournaldReporter):
     __test__ = True
 
 
-class BionicTestJournaldReporter(relbase.bionic, TestJournaldReporter):
+class CosmicTestJournaldReporter(relbase.cosmic, TestJournaldReporter):
     __test__ = True
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index ed708fd..8972ae4 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -66,11 +66,12 @@ class XenialEdgeTestLvm(relbase.xenial_edge, TestLvmAbs):
     __test__ = True
 
 
-class ArtfulTestLvm(relbase.artful, TestLvmAbs):
+class BionicTestLvm(relbase.bionic, TestLvmAbs):
     __test__ = True
 
 
-class BionicTestLvm(relbase.bionic, TestLvmAbs):
+class CosmicTestLvm(relbase.cosmic, 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 2a11d6e..cb5f33c 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -75,11 +75,11 @@ class XenialEdgeTestIscsiLvm(relbase.xenial_edge, TestLvmIscsiAbs):
     __test__ = True
 
 
-class ArtfulTestIscsiLvm(relbase.artful, TestLvmIscsiAbs):
+class BionicTestIscsiLvm(relbase.bionic, TestLvmIscsiAbs):
     __test__ = True
 
 
-class BionicTestIscsiLvm(relbase.bionic, TestLvmIscsiAbs):
+class CosmicTestIscsiLvm(relbase.cosmic, TestLvmIscsiAbs):
     __test__ = True
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
index 24ecb41..8ca69d4 100644
--- a/tests/vmtests/test_lvm_root.py
+++ b/tests/vmtests/test_lvm_root.py
@@ -92,20 +92,6 @@ class XenialTestLvmRootXfs(relbase.xenial, TestLvmRootAbs):
     }
 
 
-class ArtfulTestLvmRootExt4(relbase.artful, TestLvmRootAbs):
-    __test__ = True
-    conf_replace = {
-        '__ROOTFS_FORMAT__': 'ext4',
-    }
-
-
-class ArtfulTestLvmRootXfs(relbase.artful, TestLvmRootAbs):
-    __test__ = True
-    conf_replace = {
-        '__ROOTFS_FORMAT__': 'xfs',
-    }
-
-
 class TestUefiLvmRootAbs(TestLvmRootAbs):
     conf_file = "examples/tests/uefi_lvmroot.yaml"
     uefi = True
@@ -127,31 +113,15 @@ class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs):
     }
 
 
[e-mail]_by_date("1652822", fixby="2019-06-01")
 class XenialTestUefiLvmRootXfsBootXfs(relbase.xenial, TestUefiLvmRootAbs):
-    __test__ = True
-    conf_replace = {
-        '__BOOTFS_FORMAT__': 'xfs',  # Expected to fail until LP: #1652822
-        '__ROOTFS_FORMAT__': 'xfs',
-    }
-
-    @classmethod
-    def setUpClass(cls):
-        cls.skip_by_date("1652822", fixby="2018-05-26")
-        super().setUpClass()
+    """This tests xfs root and xfs boot with uefi.
 
-
-class ArtfulTestUefiLvmRootExt4(relbase.artful, TestUefiLvmRootAbs):
+    It is known broken (LP: #1652822) and unlikely to be fixed without pushing,
+    so we skip-by for a long time."""
     __test__ = True
     conf_replace = {
-        '__BOOTFS_FORMAT__': 'ext4',
-        '__ROOTFS_FORMAT__': 'ext4',
-    }
-
-
-class ArtfulTestUefiLvmRootXfs(relbase.artful, TestUefiLvmRootAbs):
-    __test__ = True
-    conf_replace = {
-        '__BOOTFS_FORMAT__': 'ext4',
+        '__BOOTFS_FORMAT__': 'xfs',
         '__ROOTFS_FORMAT__': 'xfs',
     }
 
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 49d4782..21cf45f 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -129,14 +129,10 @@ class TestMdadmBcacheAbs(TestMdadmAbs):
         self.test_dname(disk_to_check=self.bcache_dnames)
 
 
[e-mail]_by_date("1754581", fixby="2019-01-22", install=False)
 class TrustyTestMdadmBcache(relbase.trusty, TestMdadmBcacheAbs):
     __test__ = True
 
-    @classmethod
-    def setUpClass(cls):
-        cls.skip_by_date("1754581", fixby="2018-06-22")
-        super().setUpClass()
-
 
 class TrustyHWEXTestMdadmBcache(relbase.trusty_hwe_x, TestMdadmBcacheAbs):
     __test__ = True
@@ -154,11 +150,11 @@ class XenialEdgeTestMdadmBcache(relbase.xenial_edge, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class ArtfulTestMdadmBcache(relbase.artful, TestMdadmBcacheAbs):
+class BionicTestMdadmBcache(relbase.bionic, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class BionicTestMdadmBcache(relbase.bionic, TestMdadmBcacheAbs):
+class CosmicTestMdadmBcache(relbase.cosmic, TestMdadmBcacheAbs):
     __test__ = True
 
 
@@ -194,11 +190,11 @@ class XenialEdgeTestMirrorboot(relbase.xenial_edge, TestMirrorbootAbs):
     __test__ = True
 
 
-class ArtfulTestMirrorboot(relbase.artful, TestMirrorbootAbs):
+class BionicTestMirrorboot(relbase.bionic, TestMirrorbootAbs):
     __test__ = True
 
 
-class BionicTestMirrorboot(relbase.bionic, TestMirrorbootAbs):
+class CosmicTestMirrorboot(relbase.cosmic, TestMirrorbootAbs):
     __test__ = True
 
 
@@ -238,12 +234,12 @@ class XenialEdgeTestMirrorbootPartitions(relbase.xenial_edge,
     __test__ = True
 
 
-class ArtfulTestMirrorbootPartitions(relbase.artful,
+class BionicTestMirrorbootPartitions(relbase.bionic,
                                      TestMirrorbootPartitionsAbs):
     __test__ = True
 
 
-class BionicTestMirrorbootPartitions(relbase.bionic,
+class CosmicTestMirrorbootPartitions(relbase.cosmic,
                                      TestMirrorbootPartitionsAbs):
     __test__ = True
 
@@ -283,12 +279,12 @@ class XenialEdgeTestMirrorbootPartitionsUEFI(relbase.xenial_edge,
     __test__ = True
 
 
-class ArtfulTestMirrorbootPartitionsUEFI(relbase.artful,
+class BionicTestMirrorbootPartitionsUEFI(relbase.bionic,
                                          TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
 
 
-class BionicTestMirrorbootPartitionsUEFI(relbase.bionic,
+class CosmicTestMirrorbootPartitionsUEFI(relbase.cosmic,
                                          TestMirrorbootPartitionsUEFIAbs):
     __test__ = True
 
@@ -326,11 +322,11 @@ class XenialEdgeTestRaid5boot(relbase.xenial_edge, TestRaid5bootAbs):
     __test__ = True
 
 
-class ArtfulTestRaid5boot(relbase.artful, TestRaid5bootAbs):
+class BionicTestRaid5boot(relbase.bionic, TestRaid5bootAbs):
     __test__ = True
 
 
-class BionicTestRaid5boot(relbase.bionic, TestRaid5bootAbs):
+class CosmicTestRaid5boot(relbase.cosmic, TestRaid5bootAbs):
     __test__ = True
 
 
@@ -379,11 +375,11 @@ class XenialEdgeTestRaid6boot(relbase.xenial_edge, TestRaid6bootAbs):
     __test__ = True
 
 
-class ArtfulTestRaid6boot(relbase.artful, TestRaid6bootAbs):
+class BionicTestRaid6boot(relbase.bionic, TestRaid6bootAbs):
     __test__ = True
 
 
-class BionicTestRaid6boot(relbase.bionic, TestRaid6bootAbs):
+class CosmicTestRaid6boot(relbase.cosmic, TestRaid6bootAbs):
     __test__ = True
 
 
@@ -420,11 +416,11 @@ class XenialEdgeTestRaid10boot(relbase.xenial_edge, TestRaid10bootAbs):
     __test__ = True
 
 
-class ArtfulTestRaid10boot(relbase.artful, TestRaid10bootAbs):
+class BionicTestRaid10boot(relbase.bionic, TestRaid10bootAbs):
     __test__ = True
 
 
-class BionicTestRaid10boot(relbase.bionic, TestRaid10bootAbs):
+class CosmicTestRaid10boot(relbase.cosmic, TestRaid10bootAbs):
     __test__ = True
 
 
@@ -521,11 +517,11 @@ class XenialEdgeTestAllindata(relbase.xenial_edge, TestAllindataAbs):
     __test__ = True
 
 
-class ArtfulTestAllindata(relbase.artful, TestAllindataAbs):
+class BionicTestAllindata(relbase.bionic, TestAllindataAbs):
     __test__ = True
 
 
-class BionicTestAllindata(relbase.bionic, TestAllindataAbs):
+class CosmicTestAllindata(relbase.cosmic, 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 3c8e6ef..eba200a 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -41,11 +41,11 @@ class XenialEdgeTestIscsiMdadm(relbase.xenial_edge, TestMdadmIscsiAbs):
     __test__ = True
 
 
-class ArtfulTestIscsiMdadm(relbase.artful, TestMdadmIscsiAbs):
+class BionicTestIscsiMdadm(relbase.bionic, TestMdadmIscsiAbs):
     __test__ = True
 
 
-class BionicTestIscsiMdadm(relbase.bionic, TestMdadmIscsiAbs):
+class CosmicTestIscsiMdadm(relbase.cosmic, TestMdadmIscsiAbs):
     __test__ = True
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index ffb78b8..0bf63b7 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -66,11 +66,11 @@ class XenialEdgeTestMultipathBasic(relbase.xenial_edge, TestMultipathBasicAbs):
     __test__ = True
 
 
-class ArtfulTestMultipathBasic(relbase.artful, TestMultipathBasicAbs):
+class BionicTestMultipathBasic(relbase.bionic, TestMultipathBasicAbs):
     __test__ = True
 
 
-class BionicTestMultipathBasic(relbase.bionic, TestMultipathBasicAbs):
+class CosmicTestMultipathBasic(relbase.cosmic, TestMultipathBasicAbs):
     __test__ = True
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index 59a25fe..6532841 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -480,11 +480,11 @@ class XenialTestNetworkBasic(relbase.xenial, TestNetworkBasicAbs):
     __test__ = True
 
 
-class ArtfulTestNetworkBasic(relbase.artful, TestNetworkBasicAbs):
+class BionicTestNetworkBasic(relbase.bionic, TestNetworkBasicAbs):
     __test__ = True
 
 
-class BionicTestNetworkBasic(relbase.bionic, TestNetworkBasicAbs):
+class CosmicTestNetworkBasic(relbase.cosmic, TestNetworkBasicAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index 903b395..d466299 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -69,11 +69,11 @@ class XenialTestNetworkAlias(relbase.xenial, TestNetworkAliasAbs):
     __test__ = True
 
 
-class ArtfulTestNetworkAlias(relbase.artful, TestNetworkAliasAbs):
+class BionicTestNetworkAlias(relbase.bionic, TestNetworkAliasAbs):
     __test__ = True
 
 
-class BionicTestNetworkAlias(relbase.bionic, TestNetworkAliasAbs):
+class CosmicTestNetworkAlias(relbase.cosmic, 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 7d07413..9dba07b 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -10,9 +10,18 @@ import textwrap
 class TestNetworkBondingAbs(TestNetworkBaseTestsAbs):
     conf_file = "examples/tests/bonding_network.yaml"
 
-    def test_ifenslave_installed(self):
-        self.assertIn("ifenslave", self.debian_packages,
-                      "ifenslave deb not installed")
+    def test_ifenslave_package_status(self):
+        """ifenslave is expected installed in Ubuntu < artful."""
+        rel = self.target_release
+        pkg = "ifenslave"
+        if rel in ("precise", "trusty", "xenial"):
+            self.assertIn(
+                pkg, self.debian_packages,
+                "%s package expected in %s but not found" % (pkg, rel))
+        else:
+            self.assertNotIn(
+                pkg, self.debian_packages,
+                "%s package found but not expected in %s" % (pkg, rel))
 
 
 class CentosTestNetworkBondingAbs(TestNetworkBondingAbs):
@@ -26,7 +35,7 @@ class CentosTestNetworkBondingAbs(TestNetworkBondingAbs):
             rpm -qf `which ifenslave` |tee ifenslave_installed
         """)]
 
-    def test_ifenslave_installed(self):
+    def test_ifenslave_package_status(self):
         status = self.load_collect_file("ifenslave_installed")
         self.logger.debug('ifenslave installed: {}'.format(status))
         self.assertTrue('iputils' in status)
@@ -62,32 +71,12 @@ class XenialTestBonding(relbase.xenial, TestNetworkBondingAbs):
     __test__ = True
 
 
-class ArtfulTestBonding(relbase.artful, TestNetworkBondingAbs):
-    __test__ = True
-
-    def test_ifenslave_installed(self):
-        """Artful should not have ifenslave installed."""
-        pass
-
-    def test_ifenslave_not_installed(self):
-        """Confirm that ifenslave is not installed on artful"""
-        self.assertNotIn('ifenslave', self.debian_packages,
-                         "ifenslave is not expected in artful: %s" %
-                         self.debian_packages.get('ifenslave'))
-
-
 class BionicTestBonding(relbase.bionic, TestNetworkBondingAbs):
     __test__ = True
 
-    def test_ifenslave_installed(self):
-        """Bionic should not have ifenslave installed."""
-        pass
 
-    def test_ifenslave_not_installed(self):
-        """Confirm that ifenslave is not installed on bionic"""
-        self.assertNotIn('ifenslave', self.debian_packages,
-                         "ifenslave is not expected in bionic: %s" %
-                         self.debian_packages.get('ifenslave'))
+class CosmicTestBonding(relbase.cosmic, TestNetworkBondingAbs):
+    __test__ = True
 
 
 class Centos66TestNetworkBonding(centos_relbase.centos66fromxenial,
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index ca8964e..91df02e 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -109,9 +109,18 @@ class TestBridgeNetworkAbs(TestNetworkBaseTestsAbs):
                                  "sysfs_br0_eth1",
                                  "sysfs_br0_eth2"])
 
-    def test_bridge_utils_installed(self):
-        self.assertIn("bridge-utils", self.debian_packages,
-                      "bridge-utilsi deb not installed")
+    def test_bridge_package_status(self):
+        """bridge-utils is expected installed in Ubuntu < artful."""
+        rel = self.target_release
+        pkg = "bridge-utils"
+        if rel in ("precise", "trusty", "xenial"):
+            self.assertIn(
+                pkg, self.debian_packages,
+                "%s package expected in %s but not found" % (pkg, rel))
+        else:
+            self.assertNotIn(
+                pkg, self.debian_packages,
+                "%s package found but not expected in %s" % (pkg, rel))
 
     def test_bridge_params(self):
 
@@ -132,11 +141,10 @@ class TestBridgeNetworkAbs(TestNetworkBaseTestsAbs):
             return br0
 
         def _get_bridge_params(br):
-            release = (
-                self.target_release if self.target_release else self.release)
             bridge_params_uncheckable = default_bridge_params_uncheckable
             bridge_params_uncheckable.extend(
-                release_to_bridge_params_uncheckable.get(release, []))
+                release_to_bridge_params_uncheckable.get(
+                    self.target_release, []))
             return [p for p in br.keys()
                     if (p.startswith('bridge_') and
                         p not in bridge_params_uncheckable)]
@@ -200,7 +208,8 @@ class CentosTestBridgeNetworkAbs(TestBridgeNetworkAbs):
     def test_etc_resolvconf(self):
         pass
 
-    def test_bridge_utils_installed(self):
+    def test_bridge_package_status(self):
+        """bridge-utils is expected installed in centos."""
         self.output_files_exist(["bridge-utils_installed"])
         status = self.load_collect_file("bridge-utils_installed").strip()
         self.logger.debug('bridge-utils installed: {}'.format(status))
@@ -219,29 +228,12 @@ class Centos70TestBridgeNetwork(centos_relbase.centos70fromxenial,
 
 # only testing Yakkety or newer as older releases do not yet
 # have updated ifupdown/bridge-utils packages;
-class ArtfulTestBridging(relbase.artful, TestBridgeNetworkAbs):
+class BionicTestBridging(relbase.bionic, TestBridgeNetworkAbs):
     __test__ = True
 
-    def test_bridge_utils_installed(self):
-        """bridge-utils not needed in artful."""
-        pass
-
-    def test_bridge_utils_not_installed(self):
-        self.assertNotIn("bridge-utils", self.debian_packages,
-                         "bridge-utils is not expected in artful: %s" %
-                         self.debian_packages.get('bridge-utils'))
-
 
-class BionicTestBridging(relbase.bionic, TestBridgeNetworkAbs):
+class CosmicTestBridging(relbase.cosmic, TestBridgeNetworkAbs):
     __test__ = True
 
-    def test_bridge_utils_installed(self):
-        """bridge-utils not needed in bionic."""
-        pass
-
-    def test_bridge_utils_not_installed(self):
-        self.assertNotIn("bridge-utils", self.debian_packages,
-                         "bridge-utils is not expected in bionic: %s" %
-                         self.debian_packages.get('bridge-utils'))
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index 6d87dcf..d3c34a5 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -64,11 +64,11 @@ class XenialTestNetworkIPV6(relbase.xenial, TestNetworkIPV6Abs):
     __test__ = True
 
 
-class ArtfulTestNetworkIPV6(relbase.artful, TestNetworkIPV6Abs):
+class BionicTestNetworkIPV6(relbase.bionic, TestNetworkIPV6Abs):
     __test__ = True
 
 
-class BionicTestNetworkIPV6(relbase.bionic, TestNetworkIPV6Abs):
+class CosmicTestNetworkIPV6(relbase.cosmic, TestNetworkIPV6Abs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index 81fee8f..0396e43 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -46,11 +46,11 @@ class XenialTestNetworkIPV6Static(relbase.xenial, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
-class ArtfulTestNetworkIPV6Static(relbase.artful, TestNetworkIPV6StaticAbs):
+class BionicTestNetworkIPV6Static(relbase.bionic, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
-class BionicTestNetworkIPV6Static(relbase.bionic, TestNetworkIPV6StaticAbs):
+class CosmicTestNetworkIPV6Static(relbase.cosmic, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 68cf6e0..e001da9 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -27,11 +27,11 @@ class XenialTestNetworkIPV6Vlan(relbase.xenial, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
-class ArtfulTestNetworkIPV6Vlan(relbase.artful, TestNetworkIPV6VlanAbs):
+class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
-class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
+class CosmicTestNetworkIPV6Vlan(relbase.cosmic, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index 41b1383..7a10bf1 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -189,23 +189,15 @@ class TestNetworkMtu(relbase.xenial, TestNetworkMtuAbs):
     __test__ = True
 
 
-class ArtfulTestNetworkMtu(relbase.artful, TestNetworkMtuAbs):
[e-mail]_by_date("1671951", fixby="2018-09-26")
+class BionicTestNetworkMtu(relbase.bionic, TestNetworkMtuAbs):
     __test__ = True
 
-    @classmethod
-    def setUpClass(cls):
-        cls.skip_by_date("1671951", fixby="2018-05-26")
-        super().setUpClass()
-
 
-class BionicTestNetworkMtu(relbase.bionic, TestNetworkMtuAbs):
[e-mail]_by_date("1671951", fixby="2018-09-26")
+class CosmicTestNetworkMtu(relbase.cosmic, TestNetworkMtuAbs):
     __test__ = True
 
-    @classmethod
-    def setUpClass(cls):
-        cls.skip_by_date("1671951", fixby="2018-05-26")
-        super().setUpClass()
-
 
 class Centos66TestNetworkMtu(centos_relbase.centos66fromxenial,
                              CentosTestNetworkMtuAbs):
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index d96d3eb..40468f3 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -60,11 +60,11 @@ class XenialTestNetworkStatic(relbase.xenial, TestNetworkStaticAbs):
     __test__ = True
 
 
-class ArtfulTestNetworkStatic(relbase.artful, TestNetworkStaticAbs):
+class BionicTestNetworkStatic(relbase.bionic, TestNetworkStaticAbs):
     __test__ = True
 
 
-class BionicTestNetworkStatic(relbase.bionic, TestNetworkStaticAbs):
+class CosmicTestNetworkStatic(relbase.cosmic, TestNetworkStaticAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index 92ff267..9fa89ff 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -49,12 +49,12 @@ class XenialTestNetworkStaticRoutes(relbase.xenial,
     __test__ = True
 
 
-class ArtfulTestNetworkStaticRoutes(relbase.artful,
+class BionicTestNetworkStaticRoutes(relbase.bionic,
                                     TestNetworkStaticRoutesAbs):
     __test__ = True
 
 
-class BionicTestNetworkStaticRoutes(relbase.bionic,
+class CosmicTestNetworkStaticRoutes(relbase.cosmic,
                                     TestNetworkStaticRoutesAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 3cb6eae..94e2966 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -35,7 +35,7 @@ class TestNetworkVlanAbs(TestNetworkBaseTestsAbs):
         self.output_files_exist(link_files)
 
     def test_vlan_installed(self):
-        release = self.target_release if self.target_release else self.release
+        release = self.target_release
         if release not in ('precise', 'trusty', 'xenial', 'artful'):
             raise SkipTest("release '%s' does not need the vlan package" %
                            release)
@@ -86,11 +86,11 @@ class XenialTestNetworkVlan(relbase.xenial, TestNetworkVlanAbs):
     __test__ = True
 
 
-class ArtfulTestNetworkVlan(relbase.artful, TestNetworkVlanAbs):
+class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
     __test__ = True
 
 
-class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
+class CosmicTestNetworkVlan(relbase.cosmic, TestNetworkVlanAbs):
     __test__ = True
 
 
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index a9e3bc3..80d9cbf 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -75,11 +75,11 @@ class XenialEdgeTestNvme(relbase.xenial_edge, TestNvmeAbs):
     __test__ = True
 
 
-class ArtfulTestNvme(relbase.artful, TestNvmeAbs):
+class BionicTestNvme(relbase.bionic, TestNvmeAbs):
     __test__ = True
 
 
-class BionicTestNvme(relbase.bionic, TestNvmeAbs):
+class CosmicTestNvme(relbase.cosmic, TestNvmeAbs):
     __test__ = True
 
 
@@ -164,11 +164,12 @@ class XenialEdgeTestNvmeBcache(relbase.xenial_edge, TestNvmeBcacheAbs):
     __test__ = True
 
 
-class ArtfulTestNvmeBcache(relbase.artful, TestNvmeBcacheAbs):
+class BionicTestNvmeBcache(relbase.bionic, TestNvmeBcacheAbs):
     __test__ = True
 
 
-class BionicTestNvmeBcache(relbase.bionic, TestNvmeBcacheAbs):
+class CosmicTestNvmeBcache(relbase.cosmic, 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 abd6daf..201cca1 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -63,4 +63,7 @@ class BionicTestPollinateUserAgent(relbase.bionic, TestPollinateUserAgent):
     __test__ = True
 
 
+class CosmicTestPollinateUserAgent(relbase.cosmic, 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 aa2bebf..bb00b65 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -99,11 +99,11 @@ class XenialEdgeTestRaid5Bcache(relbase.xenial_edge, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class ArtfulTestRaid5Bcache(relbase.artful, TestMdadmBcacheAbs):
+class BionicTestRaid5Bcache(relbase.bionic, TestMdadmBcacheAbs):
     __test__ = True
 
 
-class BionicTestRaid5Bcache(relbase.bionic, TestMdadmBcacheAbs):
+class CosmicTestRaid5Bcache(relbase.cosmic, TestMdadmBcacheAbs):
     __test__ = True
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index 54fa24d..de1c675 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -43,14 +43,14 @@ class XenialTestSimple(relbase.xenial, TestSimple):
     __test__ = True
 
 
-class ArtfulTestSimple(relbase.artful, TestSimple):
+class BionicTestSimple(relbase.bionic, TestSimple):
     __test__ = True
 
     def test_output_files_exist(self):
         self.output_files_exist(["netplan.yaml"])
 
 
-class BionicTestSimple(relbase.bionic, TestSimple):
+class CosmicTestSimple(relbase.cosmic, TestSimple):
     __test__ = True
 
     def test_output_files_exist(self):
diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
index 517554f..641a077 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -112,11 +112,11 @@ class XenialEdgeUefiTestBasic(relbase.xenial_edge, TestBasicAbs):
     __test__ = True
 
 
-class ArtfulUefiTestBasic(relbase.artful, TestBasicAbs):
+class BionicUefiTestBasic(relbase.bionic, TestBasicAbs):
     __test__ = True
 
 
-class BionicUefiTestBasic(relbase.bionic, TestBasicAbs):
+class CosmicUefiTestBasic(relbase.cosmic, TestBasicAbs):
     __test__ = True
 
 
@@ -132,11 +132,11 @@ class XenialGAUefiTestBasic4k(XenialGAUefiTestBasic):
     disk_block_size = 4096
 
 
-class ArtfulUefiTestBasic4k(ArtfulUefiTestBasic):
+class BionicUefiTestBasic4k(BionicUefiTestBasic):
     disk_block_size = 4096
 
 
-class BionicUefiTestBasic4k(BionicUefiTestBasic):
+class CosmicUefiTestBasic4k(CosmicUefiTestBasic):
     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 1ebc616..e159d17 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -96,11 +96,11 @@ class XenialEdgeTestZfsRoot(relbase.xenial_edge, TestZfsRootAbs):
     __test__ = True
 
 
-class ArtfulTestZfsRoot(relbase.artful, TestZfsRootAbs):
+class BionicTestZfsRoot(relbase.bionic, TestZfsRootAbs):
     __test__ = True
 
 
-class BionicTestZfsRoot(relbase.bionic, TestZfsRootAbs):
+class CosmicTestZfsRoot(relbase.cosmic, TestZfsRootAbs):
     __test__ = True
 
 
@@ -120,3 +120,7 @@ class XenialGAi386TestZfsRootFsType(relbase.xenial_ga, TestZfsRootFsTypeAbs,
 
 class BionicTestZfsRootFsType(relbase.bionic, TestZfsRootFsTypeAbs):
     __test__ = True
+
+
+class CosmicTestZfsRootFsType(relbase.cosmic, TestZfsRootFsTypeAbs):
+    __test__ = True
diff --git a/tools/xkvm b/tools/xkvm
index deb769e..dbcba6f 100755
--- a/tools/xkvm
+++ b/tools/xkvm
@@ -648,9 +648,13 @@ main() {
 
     local bus_devices
     bus_devices=( -device "$virtio_scsi_bus,id=virtio-scsi-xkvm" )
-    cmd=( "${kvmcmd[@]}" "${archopts[@]}" 
+    local rng_devices
+    rng_devices=( -object "rng-random,filename=/dev/urandom,id=rng0"
+                  -device "virtio-rng-pci,rng=rng0" )
+    cmd=( "${kvmcmd[@]}" "${archopts[@]}"
           "${bios_opts[@]}"
           "${bus_devices[@]}"
+          "${rng_devices[@]}"
           "${netargs[@]}"
           "${diskargs[@]}" "${pt[@]}" )
     local pcmd=$(quote_cmd "${cmd[@]}")
diff --git a/tox.ini b/tox.ini
index 6f14381..8e5faf2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,7 +51,7 @@ commands = {envpython} -m flake8 {posargs:curtin tests/}
 basepython = python3
 deps = {[testenv]deps}
     pylint==1.8.1
-    bzr+lp:simplestreams
+    git+https://git.launchpad.net/simplestreams
 commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}
 
 [testenv:py27-pylint]