Merge ~raharper/curtin:ubuntu-devel-new-upstream-snapshot-20200528 into curtin:ubuntu/devel

Proposed by Ryan Harper
Status: Needs review
Proposed branch: ~raharper/curtin:ubuntu-devel-new-upstream-snapshot-20200528
Merge into: curtin:ubuntu/devel
Diff against target: 153 lines (+15/-14)
9 files modified
debian/changelog (+8/-0)
tests/vmtests/__init__.py (+3/-1)
tests/vmtests/test_basic.py (+0/-1)
tests/vmtests/test_mdadm_bcache.py (+1/-1)
tests/vmtests/test_network_ipv6_vlan.py (+0/-4)
tests/vmtests/test_network_vlan.py (+0/-2)
tests/vmtests/test_nvme.py (+1/-1)
tests/vmtests/test_raid5_bcache.py (+1/-1)
tests/vmtests/test_reuse_uefi_esp.py (+1/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Paride Legovini Approve
Chad Smith Approve
Review via email: mp+384779@code.launchpad.net

Commit message

New upstream snapshot

Changes:
 - vmtests: update skiptests
 - vmtests: allow installed centos images to reboot (LP: #1881011)

To post a comment you must log in.
Revision history for this message
Chad Smith (chad.smith) wrote :

confirmed only expected diff and build-package works

diff --git a/debian/changelog b/debian/changelog
index 59b7409b..77c845e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ curtin (20.1-2-g42a9667f-0ubuntu1) groovy; urgency=medium
     - vmtests: update skiptests
     - vmtest: allow installed centos images to reboot (LP: #1881011)

- -- Ryan Harper <email address hidden> Thu, 28 May 2020 15:35:13 -0500
+ -- Chad Smith <email address hidden> Thu, 28 May 2020 15:49:21 -0600

 curtin (20.1-0ubuntu1) groovy; urgency=medium

Revision history for this message
Chad Smith (chad.smith) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:2bfe2f2b6d18026179833f82e7b1a6c6d9888dcb

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/384779/+edit-commit-message

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Paride Legovini (paride) wrote :

Good that it didn't go into a retry loop. I set a reasonable commit message and retriggered CI.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Unmerged commits

2bfe2f2... by Ryan Harper on 2020-05-28

releasing curtin version 20.1-2-g42a9667f-0ubuntu1

9fd53d7... by Ryan Harper on 2020-05-28

update changelog (New upstream snapshot 20.1-2-g42a9667f).

399ee67... by Ryan Harper on 2020-05-28

merge from upstream/master at 20.1-2-g42a9667f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index e1a75e1..59b7409 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+curtin (20.1-2-g42a9667f-0ubuntu1) groovy; urgency=medium
7+
8+ * New upstream snapshot.
9+ - vmtests: update skiptests
10+ - vmtest: allow installed centos images to reboot (LP: #1881011)
11+
12+ -- Ryan Harper <ryan.harper@canonical.com> Thu, 28 May 2020 15:35:13 -0500
13+
14 curtin (20.1-0ubuntu1) groovy; urgency=medium
15
16 * New upstream release.
17diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
18index 32cd5fd..adfcd24 100644
19--- a/tests/vmtests/__init__.py
20+++ b/tests/vmtests/__init__.py
21@@ -1372,8 +1372,10 @@ class VMBaseClass(TestCase):
22 'serial=%s' % os.path.basename(cls.td.output_disk))
23 target_disks.extend([output_disk])
24
25+ # centos requires a reboot after first boot to do selinux relabing
26+ noreboot = ['--no-reboot'] if cls.target_distro != 'centos' else []
27 # create xkvm cmd
28- cmd = (["tools/xkvm", "-v", dowait, '--no-reboot'] +
29+ cmd = (["tools/xkvm", "-v", dowait] + noreboot +
30 uefi_flags + netdevs +
31 cls.mpath_diskargs(target_disks + extra_disks + nvme_disks) +
32 ["--disk=file=%s,if=virtio,media=cdrom" % cls.td.seed_disk] +
33diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
34index e50318d..88b9897 100644
35--- a/tests/vmtests/test_basic.py
36+++ b/tests/vmtests/test_basic.py
37@@ -340,7 +340,6 @@ class Centos70BionicTestScsiBasic(centos_relbase.centos70_bionic,
38 __test__ = True
39
40
41-@VMBaseClass.skip_by_date("1859858", fixby="2020-03-06", install=False)
42 class Centos70FocalTestScsiBasic(centos_relbase.centos70_focal,
43 TestBasicScsiAbs, CentosTestBasicAbs):
44 __test__ = True
45diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
46index 53637ae..8e250cc 100644
47--- a/tests/vmtests/test_mdadm_bcache.py
48+++ b/tests/vmtests/test_mdadm_bcache.py
49@@ -160,7 +160,7 @@ class EoanTestMdadmBcache(relbase.eoan, TestMdadmBcacheAbs):
50 class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
51 __test__ = True
52
53- @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
54+ @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
55 def test_fstab(self):
56 return super().test_fstab()
57
58diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
59index 6d38621..d8e4e16 100644
60--- a/tests/vmtests/test_network_ipv6_vlan.py
61+++ b/tests/vmtests/test_network_ipv6_vlan.py
62@@ -25,10 +25,6 @@ class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
63 class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):
64 __test__ = True
65
66- @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2020-03-10")
67- def test_ip_output(self):
68- return super().test_ip_output()
69-
70
71 class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
72 __test__ = True
73diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
74index cdd06c3..4a8d776 100644
75--- a/tests/vmtests/test_network_vlan.py
76+++ b/tests/vmtests/test_network_vlan.py
77@@ -79,7 +79,6 @@ class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
78 class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
79 __test__ = True
80
81- @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
82 def test_ip_output(self):
83 return super().test_ip_output()
84
85@@ -87,7 +86,6 @@ class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
86 class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
87 __test__ = True
88
89- @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
90 def test_ip_output(self):
91 return super().test_ip_output()
92
93diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
94index ca36ca8..c1576fa 100644
95--- a/tests/vmtests/test_nvme.py
96+++ b/tests/vmtests/test_nvme.py
97@@ -143,7 +143,7 @@ class EoanTestNvmeBcache(relbase.eoan, TestNvmeBcacheAbs):
98 __test__ = True
99
100
101-@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
102+@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
103 class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
104 __test__ = True
105
106diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
107index 7138a2c..0f0b87b 100644
108--- a/tests/vmtests/test_raid5_bcache.py
109+++ b/tests/vmtests/test_raid5_bcache.py
110@@ -95,7 +95,7 @@ class EoanTestRaid5Bcache(relbase.eoan, TestMdadmBcacheAbs):
111 class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):
112 __test__ = True
113
114- @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")
115+ @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
116 def test_fstab(self):
117 return super().test_fstab()
118
119diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
120index 1e99935..31c5e7d 100644
121--- a/tests/vmtests/test_reuse_uefi_esp.py
122+++ b/tests/vmtests/test_reuse_uefi_esp.py
123@@ -16,6 +16,7 @@ class TestUefiReuseEspAbs(TestBasicAbs):
124 self.assertEqual(1, len(distro_lines))
125
126
127+@TestUefiReuseEspAbs.skip_by_date("1881030", fixby="2020-07-15")
128 class Cent70TestUefiReuseEsp(cent_rbase.centos70_bionic, TestUefiReuseEspAbs):
129 __test__ = True
130
131@@ -28,7 +29,6 @@ class XenialGATestUefiReuseEsp(relbase.xenial_ga, TestUefiReuseEspAbs):
132 class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
133 __test__ = True
134
135- @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
136 def test_efiboot_menu_has_one_distro_entry(self):
137 return super().test_efiboot_menu_has_one_distro_entry()
138
139@@ -36,7 +36,6 @@ class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
140 class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
141 __test__ = True
142
143- @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
144 def test_efiboot_menu_has_one_distro_entry(self):
145 return super().test_efiboot_menu_has_one_distro_entry()
146
147@@ -44,7 +43,6 @@ class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
148 class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs):
149 __test__ = True
150
151- @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
152 def test_efiboot_menu_has_one_distro_entry(self):
153 return super().test_efiboot_menu_has_one_distro_entry()
154

Subscribers

People subscribed via source and target branches