curtin

Merge ~raharper/curtin:fix/20200908-fix-vmtest-master into curtin:master

  1. Git
  2. lp:~raharper/curtin
  3. fix/20200908-fix-vmtest-master
  4. Merge into master
Proposed by Ryan Harper
Status: Merged
Approved by: Paride Legovini
Approved revision: 722ae8a23a9065cca2c4a1a3ccfb0175b9dac7d1
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~raharper/curtin:fix/20200908-fix-vmtest-master
Merge into: curtin:master
Diff against target: 161 lines (+32/-11)
8 files modified
examples/tests/nvme_bcache.yaml (+2/-4)
tests/vmtests/__init__.py (+18/-1)
tests/vmtests/test_apt_config_cmd.py (+1/-1)
tests/vmtests/test_lvm_root.py (+2/-4)
tests/vmtests/test_network_ipv6.py (+4/-0)
tests/vmtests/test_network_ipv6_vlan.py (+4/-0)
tests/vmtests/test_network_vlan.py (+1/-0)
tests/vmtests/test_nvme.py (+0/-1)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+390491@code.launchpad.net

Commit message

vmtest: Fix multiple issues with vmtest on master

- Nvme-bcache: Do not mark multiple devices bootable that
  are not bootable, remove skip on Focal
- Fix PsuedoTest test_swaps_used
- Fix _serial_to_kname lookup of raid by-id paths
- Skip test_swaps_used on Groovy until LP: #1894910 is fixed
- Skip test_network_vlans Groovy until LP: #1888726 is fixed
- Disable lvm root xfs on /boot xfs test
- AptConfigCmd: Adjust regex to handling trailing slash in
  add-apt-repository URL generated

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

I'm running a full vmtest over this branch; I'll report results soon.

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

FAILED: Continuous integration, rev:2f2749e3f08a4d8dc2f2bd077a941b747d051219

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/390491/+edit-commit-message

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

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

review: Needs Fixing (continuous-integration)
~raharper/curtin:fix/20200908-fix-vmtest-master updated
236aa03... by Ryan Harper <email address hidden>

vmtest: disable lvm root xfs on /boot xfs test

209ca1e... by Ryan Harper <email address hidden>

vmtest: Adjust regex to handling trailing slash in add-apt-repository URL generated

Revision history for this message
Ryan Harper (raharper) wrote :

A couple more fixes needed for clean vmtest run:

vmtest: Adjust regex to handling trailing slash in add-apt-repository URL generated
Remove skipby for Centos70 UefiReuseEsp
vmtest: disable lvm root xfs on /boot xfs test

Re-running full vmtest.

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

FAILED: Continuous integration, rev:595fa650165ae7108e7c89ebd938a2fca984e41e

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/390491/+edit-commit-message

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

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

review: Needs Fixing (continuous-integration)
~raharper/curtin:fix/20200908-fix-vmtest-master updated
b8db427... by Ryan Harper <email address hidden>

vmtest: skip groovy network_ipv6_vlan per LP: #1888726

Revision history for this message
Ryan Harper (raharper) wrote :

----------------------------------------------------------------------
Ran 5104 tests in 3943.630s

FAILED (SKIP=829, errors=2)
Wed, 09 Sep 2020 17:20:20 -0500: vmtest end [1] in 3945s

Both are hung tasks (Guest-side kernel hang).

I think this is ready for review, and discussion on how to land.

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

FAILED: Continuous integration, rev:479be299a446d1afd270e5a33741146ded5d9a70

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/390491/+edit-commit-message

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

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

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

Hi Ryan, thanks for this!

We probably don't need one MP per change, given that most of them have a very clear scope.

What about taking out:

1e4d0243aa2375b0a48360b0e54af75c71b63ddd
479be299a446d1afd270e5a33741146ded5d9a70

as separate MPs and combine the other changes in a single MP to be squashed by CI?

review: Needs Information
Revision history for this message
Ryan Harper (raharper) wrote :

Paride,

That sounds good. I'll pull those two commits out and rebase this one.

~raharper/curtin:fix/20200908-fix-vmtest-master updated
722ae8a... by Ryan Harper <email address hidden>

Skip Groovy IPV6 networking, same issue LP: #1888726

Revision history for this message
Ryan Harper (raharper) wrote :

Split-outs:

https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/390562
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/390563

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

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

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

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

The split-outs landed and I think this is good to land too, I just reformatted a bit the commit message. Let's see if CI likes it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/tests/nvme_bcache.yaml b/examples/tests/nvme_bcache.yaml
2index 4fefd94..ed705c4 100644
3--- a/examples/tests/nvme_bcache.yaml
4+++ b/examples/tests/nvme_bcache.yaml
5@@ -1,8 +1,7 @@
6 showtrace: true
7 storage:
8 config:
9- - grub_device: true
10- id: sda
11+ - id: sda
12 model: LOGICAL VOLUME
13 name: sda
14 ptable: gpt
15@@ -23,7 +22,7 @@ storage:
16 type: disk
17 wipe: superblock
18 - device: sda
19- flag: boot
20+ grub_device: true
21 id: sda-part1
22 name: sda-part1
23 number: 1
24@@ -33,7 +32,6 @@ storage:
25 uuid: 9f0fda16-c096-4cee-82ac-4f5f294253a2
26 wipe: superblock
27 - device: sda
28- flag: boot
29 id: sda-part2
30 name: sda-part2
31 number: 2
32diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
33index 1fc3650..0b19d8f 100644
34--- a/tests/vmtests/__init__.py
35+++ b/tests/vmtests/__init__.py
36@@ -1763,7 +1763,10 @@ class VMBaseClass(TestCase):
37 for line in ls_byid.split('\n')
38 if ("virtio-" + serial) in line.split() or
39 ("scsi-" + serial) in line.split() or
40- ("wwn-" + serial) in line.split()]
41+ ("wwn-" + serial) in line.split() or
42+ (serial) in line.split()]
43+ print("Looking for serial %s in 'ls_al_byid' content\n%s" % (serial,
44+ ls_byid))
45 self.assertEqual(len(kname), 1)
46 kname = kname.pop()
47 self.assertIsNotNone(kname)
48@@ -2044,6 +2047,17 @@ class VMBaseClass(TestCase):
49
50 return swaps
51
52+ # we don't yet have a skip_by_date on specific releases
53+ if is_devel_release(self.target_release):
54+ name = "test_swaps_used"
55+ bug = "1894910"
56+ fixby = "2020-10-15"
57+ removeby = "2020-11-01"
58+ raise SkipTest(
59+ "skip_by_date({name}) LP: #{bug} "
60+ "fixby={fixby} removeby={removeby}: ".format(
61+ name=name, bug=bug, fixby=fixby, removeby=removeby))
62+
63 expected_swaps = find_fstab_swaps()
64 proc_swaps = self.load_collect_file("proc-swaps")
65 for swap in expected_swaps:
66@@ -2146,6 +2160,9 @@ class PsuedoVMBaseClass(VMBaseClass):
67 def test_kernel_img_conf(self):
68 pass
69
70+ def test_swaps_used(self):
71+ pass
72+
73 def _maybe_raise(self, exc):
74 if self.allow_test_fails:
75 raise exc
76diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
77index ae0d56c..874efad 100644
78--- a/tests/vmtests/test_apt_config_cmd.py
79+++ b/tests/vmtests/test_apt_config_cmd.py
80@@ -41,7 +41,7 @@ class TestAptConfigCMD(VMBaseClass):
81 self.check_file_regex("curtin-dev-ubuntu-test-archive-%s.list" %
82 self.release,
83 (r"http://ppa.launchpad.net/"
84- r"curtin-dev/test-archive/ubuntu"
85+ r"curtin-dev/test-archive/ubuntu(/*)"
86 r" %s main" % self.release))
87
88 def test_cmd_preserve_source(self):
89diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
90index 60a39a2..12b8ea8 100644
91--- a/tests/vmtests/test_lvm_root.py
92+++ b/tests/vmtests/test_lvm_root.py
93@@ -163,13 +163,11 @@ class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs):
94 }
95
96
97-@VMBaseClass.skip_by_date("1652822", fixby="2020-06-01", install=False)
98 class XenialTestUefiLvmRootXfsBootXfs(relbase.xenial, TestUefiLvmRootAbs):
99 """This tests xfs root and xfs boot with uefi.
100
101- It is known broken (LP: #1652822) and unlikely to be fixed without pushing,
102- so we skip-by for a long time."""
103- __test__ = True
104+ It is known broken (LP: #1652822) and unlikely to be fixed."""
105+ __test__ = False
106 conf_replace = {
107 '__BOOTFS_FORMAT__': 'xfs',
108 '__ROOTFS_FORMAT__': 'xfs',
109diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
110index d76d295..50a139c 100644
111--- a/tests/vmtests/test_network_ipv6.py
112+++ b/tests/vmtests/test_network_ipv6.py
113@@ -56,6 +56,10 @@ class BionicTestNetworkIPV6(relbase.bionic, TestNetworkIPV6Abs):
114 class GroovyTestNetworkIPV6(relbase.groovy, TestNetworkIPV6Abs):
115 __test__ = True
116
117+ @TestNetworkIPV6Abs.skip_by_date("1888726", "2020-10-15")
118+ def test_ip_output(self):
119+ return super().test_ip_output()
120+
121
122 class Centos66TestNetworkIPV6(centos_relbase.centos66_xenial,
123 CentosTestNetworkIPV6Abs):
124diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
125index 226f52e..a0bf267 100644
126--- a/tests/vmtests/test_network_ipv6_vlan.py
127+++ b/tests/vmtests/test_network_ipv6_vlan.py
128@@ -29,6 +29,10 @@ class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
129 class GroovyTestNetworkIPV6Vlan(relbase.groovy, TestNetworkIPV6VlanAbs):
130 __test__ = True
131
132+ @TestNetworkVlanAbs.skip_by_date("1888726", "2020-10-15")
133+ def test_ip_output(self):
134+ return super().test_ip_output()
135+
136
137 class Centos66TestNetworkIPV6Vlan(centos_relbase.centos66_xenial,
138 CentosTestNetworkIPV6VlanAbs):
139diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
140index c0776d6..9f1094b 100644
141--- a/tests/vmtests/test_network_vlan.py
142+++ b/tests/vmtests/test_network_vlan.py
143@@ -86,6 +86,7 @@ class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
144 class GroovyTestNetworkVlan(relbase.groovy, TestNetworkVlanAbs):
145 __test__ = True
146
147+ @TestNetworkVlanAbs.skip_by_date("1888726", "2020-10-15")
148 def test_ip_output(self):
149 return super().test_ip_output()
150
151diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
152index 5da68cf..39f9f3c 100644
153--- a/tests/vmtests/test_nvme.py
154+++ b/tests/vmtests/test_nvme.py
155@@ -139,7 +139,6 @@ class BionicTestNvmeBcache(relbase.bionic, TestNvmeBcacheAbs):
156 __test__ = True
157
158
159-@TestNvmeBcacheAbs.skip_by_date("1861941", fixby="2020-09-15")
160 class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
161 __test__ = True
162

Subscribers

People subscribed via source and target branches