Merge lp:~raharper/curtin/trunk.vmtest-drop-precise into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

Drop Precise from vmtest

It's dead Jim (Precise)

[Ryan Harper (raharper)]

vmtest says it's all good:

----------------------------------------------------------------------
Ran 2060 tests in 10197.864s

OK (SKIP=149)
Sat, 04 Nov 2017 00:20:34 +0000: vmtest end [0] in 10253s

https://jenkins.ubuntu.com/server/view/curtin/job/curtin-vmtest-devel-debug/18/consoleFull

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

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

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

review: Approve (continuous-integration)

[Scott Moser (smoser)]

There are 2 occurences of 'precise' in tests/vmtests/__init__.py

one related to limited support for cloud-config-archive.
I'm kind of confused by the frist one (which i probably wrote), so lets just leave it for now.

The second one I think can be dropped ('failsafe poweroff').
And I don'tthink it is valid for centos anymore either... poweroff should work there as we now only deploy images with newer cloud-init.

I'm happy if you want to do that as a followon, but it looks like we could drop that bit.

other than that, i think I approve.

review: Approve

=== modified file 'tests/vmtests/releases.py'
--- tests/vmtests/releases.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/releases.py	2017-11-06 16:27:54 +0000
@@ -39,15 +39,6 @@
     target_release = "centos66"
 
 
-class _PreciseBase(_UbuntuBase):
-    release = "precise"
-
-
-class _PreciseHWET(_UbuntuBase):
-    release = "precise"
-    krel = "trusty"
-
-
 class _TrustyBase(_UbuntuBase):
     release = "trusty"
 
@@ -90,8 +81,6 @@
 
 
 class _Releases(object):
-    precise = _PreciseBase
-    precise_hwe_t = _PreciseHWET
     trusty = _TrustyBase
     trusty_hwe_u = _TrustyHWEU
     trusty_hwe_v = _TrustyHWEV

=== modified file 'tests/vmtests/test_basic.py'
--- tests/vmtests/test_basic.py	2017-08-02 16:26:25 +0000
+++ tests/vmtests/test_basic.py	2017-11-06 16:27:54 +0000
@@ -137,49 +137,6 @@
         self.assertEqual(source_version, installed_version)
 
 
-class PreciseTestBasic(relbase.precise, TestBasicAbs):
-    __test__ = True
-
-    collect_scripts = [textwrap.dedent("""
-        cd OUTPUT_COLLECT_D
-        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-show /dev/vdd | awk '/uuid/ {print $4}' > $f
-        cat /proc/partitions > proc_partitions
-        ls -al /dev/disk/by-uuid/ > ls_uuid
-        cat /etc/fstab > fstab
-        mkdir -p /dev/disk/by-dname
-        ls /dev/disk/by-dname/ > ls_dname
-        find /etc/network/interfaces.d > find_interfacesd
-
-        v=""
-        out=$(apt-config shell v Acquire::HTTP::Proxy)
-        eval "$out"
-        echo "$v" > apt-proxy
-        """)]
-
-    def test_whole_disk_format(self):
-        # confirm the whole disk format is the expected device
-        btrfs_uuid = self.load_collect_file("btrfs_uuid_vdd").strip()
-
-        self.assertTrue(btrfs_uuid is not None)
-        self.assertEqual(len(btrfs_uuid), 36)
-
-        # extract uuid from ls_uuid by kname
-        kname_uuid = self._kname_to_uuid('vdd')
-
-        # compare them
-        self.assertEqual(kname_uuid, btrfs_uuid)
-
-    def test_ptable(self):
-        print("test_ptable does not work for Precise")
-
-    def test_dname(self):
-        print("test_dname does not work for Precise")
-
-
 class TrustyTestBasic(relbase.trusty, TestBasicAbs):
     __test__ = True
 
@@ -193,11 +150,6 @@
         print("test_ptable does not work for Trusty")
 
 
-class PreciseHWETTestBasic(relbase.precise_hwe_t, PreciseTestBasic):
-    # FIXME: off due to test_whole_disk_format failing
-    __test__ = False
-
-
 class TrustyHWEXTestBasic(relbase.trusty_hwe_x, TrustyTestBasic):
     __test__ = True
 

=== modified file 'tests/vmtests/test_bcache_basic.py'
--- tests/vmtests/test_bcache_basic.py	2017-10-23 17:49:45 +0000
+++ tests/vmtests/test_bcache_basic.py	2017-11-06 16:27:54 +0000
@@ -43,10 +43,6 @@
         self.check_file_regex("cmdline", r"root=UUID=")
 
 
-class PreciseHWETBcacheBasic(relbase.precise_hwe_t, TestBcacheBasic):
-    __test__ = True
-
-
 class TrustyBcacheBasic(relbase.trusty, TestBcacheBasic):
     __test__ = False  # covered by test_raid5_bcache
 

=== modified file 'tests/vmtests/test_bcache_bug1718699.py'
--- tests/vmtests/test_bcache_bug1718699.py	2017-10-25 15:45:26 +0000
+++ tests/vmtests/test_bcache_bug1718699.py	2017-11-06 16:27:54 +0000
@@ -9,10 +9,6 @@
     extra_disks = ['10G']
 
 
-class PreciseTestBcacheBug1718699(relbase.precise_hwe_t, TestBcacheBug1718699):
-    __test__ = True
-
-
 class XenialTestBcacheBug1718699(relbase.xenial, TestBcacheBug1718699):
     __test__ = True
 

=== modified file 'tests/vmtests/test_iscsi.py'
--- tests/vmtests/test_iscsi.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_iscsi.py	2017-11-06 16:27:54 +0000
@@ -47,10 +47,6 @@
                              (testfile, expected_content, content))
 
 
-class PreciseTestIscsiBasic(relbase.precise, TestBasicIscsiAbs):
-    __test__ = True
-
-
 class TrustyTestIscsiBasic(relbase.trusty, TestBasicIscsiAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_lvm.py'
--- tests/vmtests/test_lvm.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_lvm.py	2017-11-06 16:27:54 +0000
@@ -48,14 +48,6 @@
             raise SkipTest("test_dname does not work for %s" % self.release)
 
 
-class PreciseTestLvm(relbase.precise, TestLvmAbs):
-    __test__ = True
-
-
-class PreciseHWETTestLvm(relbase.precise_hwe_t, PreciseTestLvm):
-    __test__ = True
-
-
 class TrustyTestLvm(relbase.trusty, TestLvmAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_lvm_iscsi.py'
--- tests/vmtests/test_lvm_iscsi.py	2017-08-29 02:20:46 +0000
+++ tests/vmtests/test_lvm_iscsi.py	2017-11-06 16:27:54 +0000
@@ -47,10 +47,6 @@
         self.check_file_strippedline("pvs", "vg2=/dev/sdb6")
 
 
-class PreciseTestIscsiLvm(relbase.precise, TestLvmIscsiAbs):
-    __test__ = True
-
-
 class TrustyTestIscsiLvm(relbase.trusty, TestLvmIscsiAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_mdadm_iscsi.py'
--- tests/vmtests/test_mdadm_iscsi.py	2017-09-06 16:09:08 +0000
+++ tests/vmtests/test_mdadm_iscsi.py	2017-11-06 16:27:54 +0000
@@ -22,10 +22,6 @@
         """)]
 
 
-class PreciseTestIscsiMdadm(relbase.precise, TestMdadmIscsiAbs):
-    __test__ = True
-
-
 class TrustyTestIscsiMdadm(relbase.trusty, TestMdadmIscsiAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network.py'
--- tests/vmtests/test_network.py	2017-10-05 19:52:27 +0000
+++ tests/vmtests/test_network.py	2017-11-06 16:27:54 +0000
@@ -449,11 +449,6 @@
         pass
 
 
-class PreciseHWETTestNetworkBasic(relbase.precise_hwe_t, TestNetworkBasicAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkBasic(relbase.trusty, TestNetworkBasicAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_alias.py'
--- tests/vmtests/test_network_alias.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_network_alias.py	2017-11-06 16:27:54 +0000
@@ -41,11 +41,6 @@
     __test__ = True
 
 
-class PreciseHWETTestNetworkAlias(relbase.precise_hwe_t, TestNetworkAliasAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = True
-
-
 class TrustyTestNetworkAlias(relbase.trusty, TestNetworkAliasAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_bonding.py'
--- tests/vmtests/test_network_bonding.py	2017-10-05 21:13:05 +0000
+++ tests/vmtests/test_network_bonding.py	2017-11-06 16:27:54 +0000
@@ -38,14 +38,6 @@
         pass
 
 
-class PreciseHWETTestBonding(relbase.precise_hwe_t, TestNetworkBondingAbs):
-    __test__ = True
-
-    def test_ifenslave_installed(self):
-        self.assertIn("ifenslave-2.6", self.debian_packages,
-                      "ifenslave deb not installed")
-
-
 class TrustyTestBonding(relbase.trusty, TestNetworkBondingAbs):
     __test__ = False
 

=== modified file 'tests/vmtests/test_network_enisource.py'
--- tests/vmtests/test_network_enisource.py	2017-10-05 18:11:24 +0000
+++ tests/vmtests/test_network_enisource.py	2017-11-06 16:27:54 +0000
@@ -79,12 +79,6 @@
         self.assertEqual(_nocidr(expected_address), _nocidr(actual_address))
 
 
-class PreciseTestNetworkENISource(relbase.precise, TestNetworkENISource):
-    __test__ = False
-    # not working, still debugging though; possible older ifupdown doesn't
-    # like the multiple iface method.
-
-
 class TrustyTestNetworkENISource(relbase.trusty, TestNetworkENISource):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_ipv6.py'
--- tests/vmtests/test_network_ipv6.py	2017-10-03 16:44:50 +0000
+++ tests/vmtests/test_network_ipv6.py	2017-11-06 16:27:54 +0000
@@ -40,11 +40,6 @@
         pass
 
 
-class PreciseHWETTestNetwork(relbase.precise_hwe_t, TestNetworkIPV6Abs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkIPV6(relbase.trusty, TestNetworkIPV6Abs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_ipv6_enisource.py'
--- tests/vmtests/test_network_ipv6_enisource.py	2017-10-03 16:44:50 +0000
+++ tests/vmtests/test_network_ipv6_enisource.py	2017-11-06 16:27:54 +0000
@@ -12,13 +12,6 @@
         pass
 
 
-class PreciseTestNetworkIPV6ENISource(relbase.precise,
-                                      TestNetworkIPV6ENISource):
-    __test__ = False
-    # not working, still debugging though; possible older ifupdown doesn't
-    # like the multiple iface method.
-
-
 class TrustyTestNetworkIPV6ENISource(relbase.trusty, TestNetworkIPV6ENISource):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_ipv6_static.py'
--- tests/vmtests/test_network_ipv6_static.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_network_ipv6_static.py	2017-11-06 16:27:54 +0000
@@ -13,11 +13,6 @@
     conf_file = "examples/tests/basic_network_static_ipv6.yaml"
 
 
-class PreciseHWETTestNetworkIPV6Static(relbase.precise_hwe_t,
-                                       TestNetworkIPV6StaticAbs):
-    __test__ = True
-
-
 class TrustyTestNetworkIPV6Static(relbase.trusty, TestNetworkIPV6StaticAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_ipv6_vlan.py'
--- tests/vmtests/test_network_ipv6_vlan.py	2017-10-03 16:44:50 +0000
+++ tests/vmtests/test_network_ipv6_vlan.py	2017-11-06 16:27:54 +0000
@@ -12,22 +12,6 @@
     conf_file = "examples/tests/vlan_network_ipv6.yaml"
 
 
-class PreciseTestNetworkIPV6Vlan(relbase.precise, TestNetworkIPV6VlanAbs):
-    __test__ = True
-
-    # precise ip -d link show output is different (of course)
-    def test_vlan_enabled(self):
-
-        # we must have at least one
-        self.assertGreaterEqual(len(self.get_vlans()), 1)
-
-        # did they get configured?
-        for vlan in self.get_vlans():
-            link_file = "ip_link_show_" + vlan['name']
-            vlan_msg = "vlan id " + str(vlan['vlan_id'])
-            self.check_file_regex(link_file, vlan_msg)
-
-
 class TrustyTestNetworkIPV6Vlan(relbase.trusty, TestNetworkIPV6VlanAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_mtu.py'
--- tests/vmtests/test_network_mtu.py	2017-10-23 15:58:08 +0000
+++ tests/vmtests/test_network_mtu.py	2017-11-06 16:27:54 +0000
@@ -155,11 +155,6 @@
         pass
 
 
-class PreciseHWETTestNetworkMtu(relbase.precise_hwe_t, TestNetworkMtuAbs):
-    # FIXME: Precise mtu / ipv6 is buggy
-    __test__ = False
-
-
 class TrustyTestNetworkMtu(relbase.trusty, TestNetworkMtuAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_static.py'
--- tests/vmtests/test_network_static.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_network_static.py	2017-11-06 16:27:54 +0000
@@ -28,12 +28,6 @@
         pass
 
 
-class PreciseHWETTestNetworkStatic(relbase.precise_hwe_t,
-                                   TestNetworkStaticAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkStatic(relbase.trusty, TestNetworkStaticAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_network_static_routes.py'
--- tests/vmtests/test_network_static_routes.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_network_static_routes.py	2017-11-06 16:27:54 +0000
@@ -16,12 +16,6 @@
     conf_file = "examples/tests/network_static_routes.yaml"
 
 
-class PreciseHWETTestNetworkStaticRoutes(relbase.precise_hwe_t,
-                                         TestNetworkStaticRoutesAbs):
-    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
-    __test__ = False
-
-
 class TrustyTestNetworkStaticRoutes(relbase.trusty,
                                     TestNetworkStaticRoutesAbs):
     __test__ = True

=== modified file 'tests/vmtests/test_network_vlan.py'
--- tests/vmtests/test_network_vlan.py	2017-10-05 21:13:05 +0000
+++ tests/vmtests/test_network_vlan.py	2017-11-06 16:27:54 +0000
@@ -68,22 +68,6 @@
         pass
 
 
-class PreciseTestNetworkVlan(relbase.precise, TestNetworkVlanAbs):
-    __test__ = True
-
-    # precise ip -d link show output is different (of course)
-    def test_vlan_enabled(self):
-
-        # we must have at least one
-        self.assertGreaterEqual(len(self.get_vlans()), 1)
-
-        # did they get configured?
-        for vlan in self.get_vlans():
-            link_file = "ip_link_show_" + vlan['name']
-            vlan_msg = "vlan id " + str(vlan['vlan_id'])
-            self.check_file_regex(link_file, vlan_msg)
-
-
 class TrustyTestNetworkVlan(relbase.trusty, TestNetworkVlanAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_nvme.py'
--- tests/vmtests/test_nvme.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_nvme.py	2017-11-06 16:27:54 +0000
@@ -53,11 +53,6 @@
             self.check_file_strippedline("ls_dev_nvme", "/dev/nvme1")
 
 
-class PreciseTestNvme(relbase.precise, TestNvmeAbs):
-    __test__ = False
-    # Precise kernel doesn't have NVME support, with TrustyHWE it would
-
-
 class TrustyTestNvme(relbase.trusty, TestNvmeAbs):
     __test__ = True
 

=== modified file 'tests/vmtests/test_raid5_bcache.py'
--- tests/vmtests/test_raid5_bcache.py	2017-08-02 15:46:35 +0000
+++ tests/vmtests/test_raid5_bcache.py	2017-11-06 16:27:54 +0000
@@ -65,11 +65,6 @@
         self.check_file_regex("bcache_cache_mode", r"\[writeback\]")
 
 
-class PreciseHWETTestRaid5Bcache(relbase.precise_hwe_t, TestMdadmBcacheAbs):
-    # FIXME: off due to failing install: RUN_ARRAY failed: Invalid argument
-    __test__ = False
-
-
 class TrustyTestRaid5Bcache(relbase.trusty, TestMdadmBcacheAbs):
     __test__ = True
     # FIXME(LP: #1523037): dname does not work on trusty, so we cannot expect

=== modified file 'tests/vmtests/test_uefi_basic.py'
--- tests/vmtests/test_uefi_basic.py	2017-10-10 15:41:20 +0000
+++ tests/vmtests/test_uefi_basic.py	2017-11-06 16:27:54 +0000
@@ -76,16 +76,6 @@
             self.assertEqual(self.disk_block_size, size)
 
 
-class PreciseUefiTestBasic(relbase.precise, TestBasicAbs):
-    __test__ = True
-
-    def test_ptable(self):
-        print("test_ptable does not work for Precise")
-
-    def test_dname(self):
-        print("test_dname does not work for Precise")
-
-
 class TrustyUefiTestBasic(relbase.trusty, TestBasicAbs):
     __test__ = True
 
@@ -115,10 +105,6 @@
     __test__ = True
 
 
-class PreciseUefiTestBasic4k(PreciseUefiTestBasic):
-    disk_block_size = 4096
-
-
 class TrustyUefiTestBasic4k(TrustyUefiTestBasic):
     disk_block_size = 4096