curtin-dev team mailing list archive

[Ryan Harper <ryan.harper@xxxxxxxxxxxxx>]

Ryan Harper has proposed merging ~raharper/curtin:ubuntu-devel-new-upstream-snapshot-20200528 into curtin:ubuntu/devel.

Requested reviews:
  curtin developers (curtin-dev)
Related bugs:
  Bug #1881011 in curtin (Ubuntu): "vmtest: no-reboot prevents installed centos images from reporting success"
  https://bugs.launchpad.net/ubuntu/+source/curtin/+bug/1881011

For more details, see:
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/384779
-- 
Your team curtin developers is requested to review the proposed merge of ~raharper/curtin:ubuntu-devel-new-upstream-snapshot-20200528 into curtin:ubuntu/devel.

diff --git a/debian/changelog b/debian/changelog
index e1a75e1..59b7409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+curtin (20.1-2-g42a9667f-0ubuntu1) groovy; urgency=medium
+
+  * New upstream snapshot.
+    - vmtests: update skiptests
+    - vmtest: allow installed centos images to reboot (LP: #1881011)
+
+ -- Ryan Harper <ryan.harper@xxxxxxxxxxxxx>  Thu, 28 May 2020 15:35:13 -0500
+
 curtin (20.1-0ubuntu1) groovy; urgency=medium
 
   * New upstream release.
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 32cd5fd..adfcd24 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1372,8 +1372,10 @@ class VMBaseClass(TestCase):
             'serial=%s' % os.path.basename(cls.td.output_disk))
         target_disks.extend([output_disk])
 
+        # centos requires a reboot after first boot to do selinux relabing
+        noreboot = ['--no-reboot'] if cls.target_distro != 'centos' else []
         # create xkvm cmd
-        cmd = (["tools/xkvm", "-v", dowait, '--no-reboot'] +
+        cmd = (["tools/xkvm", "-v", dowait] + noreboot +
                uefi_flags + netdevs +
                cls.mpath_diskargs(target_disks + extra_disks + nvme_disks) +
                ["--disk=file=%s,if=virtio,media=cdrom" % cls.td.seed_disk] +
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index e50318d..88b9897 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -340,7 +340,6 @@ class Centos70BionicTestScsiBasic(centos_relbase.centos70_bionic,
     __test__ = True
 
 
-@VMBaseClass.skip_by_date("1859858", fixby="2020-03-06", install=False)
 class Centos70FocalTestScsiBasic(centos_relbase.centos70_focal,
                                  TestBasicScsiAbs, CentosTestBasicAbs):
     __test__ = True
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 53637ae..8e250cc 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -160,7 +160,7 @@ class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
 class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
     __test__ = True
 
-    @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
+    @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
     def test_fstab(self):
         return super().test_fstab()
 
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 6d38621..d8e4e16 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -25,10 +25,6 @@ class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
 class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):
     __test__ = True
 
-    @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2020-03-10")
-    def test_ip_output(self):
-        return super().test_ip_output()
-
 
 class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index cdd06c3..4a8d776 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -79,7 +79,6 @@ class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
 class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
     __test__ = True
 
-    @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
     def test_ip_output(self):
         return super().test_ip_output()
 
@@ -87,7 +86,6 @@ class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
 class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
     __test__ = True
 
-    @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
     def test_ip_output(self):
         return super().test_ip_output()
 
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index ca36ca8..c1576fa 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -143,7 +143,7 @@ class EoanTestNvmeBcache(relbase.eoan, TestNvmeBcacheAbs):
     __test__ = True
 
 
-@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
+@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
 class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
index 7138a2c..0f0b87b 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -95,7 +95,7 @@ class EoanTestRaid5Bcache(relbase.eoan, TestMdadmBcacheAbs):
 class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):
     __test__ = True
 
-    @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
+    @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
     def test_fstab(self):
         return super().test_fstab()
 
diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
index 1e99935..31c5e7d 100644
--- a/tests/vmtests/test_reuse_uefi_esp.py
+++ b/tests/vmtests/test_reuse_uefi_esp.py
@@ -16,6 +16,7 @@ class TestUefiReuseEspAbs(TestBasicAbs):
         self.assertEqual(1, len(distro_lines))
 
 
+@TestUefiReuseEspAbs.skip_by_date("1881030", fixby="2020-07-15")
 class Cent70TestUefiReuseEsp(cent_rbase.centos70_bionic, TestUefiReuseEspAbs):
     __test__ = True
 
@@ -28,7 +29,6 @@ class XenialGATestUefiReuseEsp(relbase.xenial_ga, TestUefiReuseEspAbs):
 class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
     __test__ = True
 
-    @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
     def test_efiboot_menu_has_one_distro_entry(self):
         return super().test_efiboot_menu_has_one_distro_entry()
 
@@ -36,7 +36,6 @@ class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
 class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
     __test__ = True
 
-    @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
     def test_efiboot_menu_has_one_distro_entry(self):
         return super().test_efiboot_menu_has_one_distro_entry()
 
@@ -44,7 +43,6 @@ class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
 class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs):
     __test__ = True
 
-    @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
     def test_efiboot_menu_has_one_distro_entry(self):
         return super().test_efiboot_menu_has_one_distro_entry()