curtin

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

  1. Git
  2. lp:~raharper/curtin
  3. ubuntu-devel-new-upstream-snapshot-20200528
  4. Merge into 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

Reply
Revision history for this message
Chad Smith (chad.smith) :
review: Approve
Reply
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)
Reply
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
Reply
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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

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

review: Approve (continuous-integration)
Reply

Unmerged commits

2bfe2f2... by Ryan Harper

releasing curtin version 20.1-2-g42a9667f-0ubuntu1

9fd53d7... by Ryan Harper

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

399ee67... by Ryan Harper

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
diff --git a/debian/changelog b/debian/changelog
index e1a75e1..59b7409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1curtin (20.1-2-g42a9667f-0ubuntu1) groovy; urgency=medium
2
3 * New upstream snapshot.
4 - vmtests: update skiptests
5 - vmtest: allow installed centos images to reboot (LP: #1881011)
6
7 -- Ryan Harper <ryan.harper@canonical.com> Thu, 28 May 2020 15:35:13 -0500
8
1curtin (20.1-0ubuntu1) groovy; urgency=medium9curtin (20.1-0ubuntu1) groovy; urgency=medium
210
3 * New upstream release.11 * 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):
1372 'serial=%s' % os.path.basename(cls.td.output_disk))1372 'serial=%s' % os.path.basename(cls.td.output_disk))
1373 target_disks.extend([output_disk])1373 target_disks.extend([output_disk])
13741374
1375 # centos requires a reboot after first boot to do selinux relabing
1376 noreboot = ['--no-reboot'] if cls.target_distro != 'centos' else []
1375 # create xkvm cmd1377 # create xkvm cmd
1376 cmd = (["tools/xkvm", "-v", dowait, '--no-reboot'] +1378 cmd = (["tools/xkvm", "-v", dowait] + noreboot +
1377 uefi_flags + netdevs +1379 uefi_flags + netdevs +
1378 cls.mpath_diskargs(target_disks + extra_disks + nvme_disks) +1380 cls.mpath_diskargs(target_disks + extra_disks + nvme_disks) +
1379 ["--disk=file=%s,if=virtio,media=cdrom" % cls.td.seed_disk] +1381 ["--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,
340 __test__ = True340 __test__ = True
341341
342342
343@VMBaseClass.skip_by_date("1859858", fixby="2020-03-06", install=False)
344class Centos70FocalTestScsiBasic(centos_relbase.centos70_focal,343class Centos70FocalTestScsiBasic(centos_relbase.centos70_focal,
345 TestBasicScsiAbs, CentosTestBasicAbs):344 TestBasicScsiAbs, CentosTestBasicAbs):
346 __test__ = True345 __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):
160class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):160class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
161 __test__ = True161 __test__ = True
162162
163 @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")163 @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
164 def test_fstab(self):164 def test_fstab(self):
165 return super().test_fstab()165 return super().test_fstab()
166166
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):
25class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):25class EoanTestNetworkIPV6Vlan(relbase.eoan, TestNetworkIPV6VlanAbs):
26 __test__ = True26 __test__ = True
2727
28 @TestNetworkVlanAbs.skip_by_date("1846232", fixby="2020-03-10")
29 def test_ip_output(self):
30 return super().test_ip_output()
31
3228
33class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):29class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
34 __test__ = True30 __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):
79class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):79class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
80 __test__ = True80 __test__ = True
8181
82 @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
83 def test_ip_output(self):82 def test_ip_output(self):
84 return super().test_ip_output()83 return super().test_ip_output()
8584
@@ -87,7 +86,6 @@ class EoanTestNetworkVlan(relbase.eoan, TestNetworkVlanAbs):
87class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):86class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
88 __test__ = True87 __test__ = True
8988
90 @TestNetworkBaseTestsAbs.skip_by_date("1846232", fixby="2020-03-10")
91 def test_ip_output(self):89 def test_ip_output(self):
92 return super().test_ip_output()90 return super().test_ip_output()
9391
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):
143 __test__ = True143 __test__ = True
144144
145145
146@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")146@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
147class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):147class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
148 __test__ = True148 __test__ = True
149149
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):
95class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):95class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):
96 __test__ = True96 __test__ = True
9797
98 @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-04-15")98 @TestMdadmBcacheAbs.skip_by_date("1861941", fixby="2020-07-15")
99 def test_fstab(self):99 def test_fstab(self):
100 return super().test_fstab()100 return super().test_fstab()
101101
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):
16 self.assertEqual(1, len(distro_lines))16 self.assertEqual(1, len(distro_lines))
1717
1818
19@TestUefiReuseEspAbs.skip_by_date("1881030", fixby="2020-07-15")
19class Cent70TestUefiReuseEsp(cent_rbase.centos70_bionic, TestUefiReuseEspAbs):20class Cent70TestUefiReuseEsp(cent_rbase.centos70_bionic, TestUefiReuseEspAbs):
20 __test__ = True21 __test__ = True
2122
@@ -28,7 +29,6 @@ class XenialGATestUefiReuseEsp(relbase.xenial_ga, TestUefiReuseEspAbs):
28class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):29class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
29 __test__ = True30 __test__ = True
3031
31 @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
32 def test_efiboot_menu_has_one_distro_entry(self):32 def test_efiboot_menu_has_one_distro_entry(self):
33 return super().test_efiboot_menu_has_one_distro_entry()33 return super().test_efiboot_menu_has_one_distro_entry()
3434
@@ -36,7 +36,6 @@ class BionicTestUefiReuseEsp(relbase.bionic, TestUefiReuseEspAbs):
36class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):36class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
37 __test__ = True37 __test__ = True
3838
39 @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
40 def test_efiboot_menu_has_one_distro_entry(self):39 def test_efiboot_menu_has_one_distro_entry(self):
41 return super().test_efiboot_menu_has_one_distro_entry()40 return super().test_efiboot_menu_has_one_distro_entry()
4241
@@ -44,7 +43,6 @@ class EoanTestUefiReuseEsp(relbase.eoan, TestUefiReuseEspAbs):
44class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs):43class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs):
45 __test__ = True44 __test__ = True
4645
47 @TestUefiReuseEspAbs.skip_by_date("1863015", fixby="2020-04-15")
48 def test_efiboot_menu_has_one_distro_entry(self):46 def test_efiboot_menu_has_one_distro_entry(self):
49 return super().test_efiboot_menu_has_one_distro_entry()47 return super().test_efiboot_menu_has_one_distro_entry()
5048

Subscribers

People subscribed via source and target branches