Merge lp:~raharper/curtin/trunk.add-artful into lp:~curtin-dev/curtin/trunk

Proposed by Ryan Harper
Status: Merged
Approved by: Scott Moser
Approved revision: 494
Merged at revision: 496
Proposed branch: lp:~raharper/curtin/trunk.add-artful
Merge into: lp:~curtin-dev/curtin/trunk
Diff against target: 439 lines (+157/-2)
25 files modified
tests/vmtests/releases.py (+5/-0)
tests/vmtests/test_apt_config_cmd.py (+4/-0)
tests/vmtests/test_basic.py (+8/-0)
tests/vmtests/test_bcache_basic.py (+4/-0)
tests/vmtests/test_iscsi.py (+4/-0)
tests/vmtests/test_lvm.py (+4/-0)
tests/vmtests/test_mdadm_bcache.py (+34/-0)
tests/vmtests/test_multipath.py (+4/-0)
tests/vmtests/test_network.py (+4/-0)
tests/vmtests/test_network_alias.py (+4/-0)
tests/vmtests/test_network_bonding.py (+4/-0)
tests/vmtests/test_network_bridging.py (+4/-0)
tests/vmtests/test_network_enisource.py (+4/-0)
tests/vmtests/test_network_ipv6.py (+4/-0)
tests/vmtests/test_network_ipv6_enisource.py (+5/-2)
tests/vmtests/test_network_ipv6_static.py (+4/-0)
tests/vmtests/test_network_ipv6_vlan.py (+4/-0)
tests/vmtests/test_network_mtu.py (+4/-0)
tests/vmtests/test_network_static.py (+8/-0)
tests/vmtests/test_network_static_routes.py (+9/-0)
tests/vmtests/test_network_vlan.py (+8/-0)
tests/vmtests/test_nvme.py (+8/-0)
tests/vmtests/test_raid5_bcache.py (+4/-0)
tests/vmtests/test_simple.py (+4/-0)
tests/vmtests/test_uefi_basic.py (+8/-0)
To merge this branch: bzr merge lp:~raharper/curtin/trunk.add-artful
Reviewer Review Type Date Requested Status
Scott Moser (community) Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+323909@code.launchpad.net

Description of the change

vmtests: add Artful release

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/vmtests/releases.py'
2--- tests/vmtests/releases.py 2017-02-17 18:50:27 +0000
3+++ tests/vmtests/releases.py 2017-05-11 13:54:53 +0000
4@@ -97,6 +97,10 @@
5 release = "zesty"
6
7
8+class _ArtfulBase(_UbuntuBase):
9+ release = "artful"
10+
11+
12 class _Releases(object):
13 precise = _PreciseBase
14 precise_hwe_t = _PreciseHWET
15@@ -111,6 +115,7 @@
16 xenial = _XenialBase
17 yakkety = _YakketyBase
18 zesty = _ZestyBase
19+ artful = _ArtfulBase
20
21
22 class _CentosReleases(object):
23
24=== modified file 'tests/vmtests/test_apt_config_cmd.py'
25--- tests/vmtests/test_apt_config_cmd.py 2017-01-27 22:05:39 +0000
26+++ tests/vmtests/test_apt_config_cmd.py 2017-05-11 13:54:53 +0000
27@@ -61,3 +61,7 @@
28
29 class ZestyTestAptConfigCMDCMD(relbase.zesty, TestAptConfigCMD):
30 __test__ = True
31+
32+
33+class ArtfulTestAptConfigCMDCMD(relbase.artful, TestAptConfigCMD):
34+ __test__ = True
35
36=== modified file 'tests/vmtests/test_basic.py'
37--- tests/vmtests/test_basic.py 2017-04-21 17:45:34 +0000
38+++ tests/vmtests/test_basic.py 2017-05-11 13:54:53 +0000
39@@ -217,6 +217,10 @@
40 __test__ = True
41
42
43+class ArtfulTestBasic(relbase.artful, TestBasicAbs):
44+ __test__ = True
45+
46+
47 class TestBasicScsiAbs(TestBasicAbs):
48 conf_file = "examples/tests/basic_scsi.yaml"
49 disk_driver = 'scsi-hd'
50@@ -323,3 +327,7 @@
51
52 class ZestyTestScsiBasic(relbase.zesty, TestBasicScsiAbs):
53 __test__ = True
54+
55+
56+class ArtfulTestScsiBasic(relbase.artful, TestBasicScsiAbs):
57+ __test__ = True
58
59=== modified file 'tests/vmtests/test_bcache_basic.py'
60--- tests/vmtests/test_bcache_basic.py 2017-04-06 20:14:30 +0000
61+++ tests/vmtests/test_bcache_basic.py 2017-05-11 13:54:53 +0000
62@@ -63,3 +63,7 @@
63
64 class ZestyBcacheBasic(relbase.zesty, TestBcacheBasic):
65 __test__ = True
66+
67+
68+class ArtfulBcacheBasic(relbase.artful, TestBcacheBasic):
69+ __test__ = True
70
71=== modified file 'tests/vmtests/test_iscsi.py'
72--- tests/vmtests/test_iscsi.py 2017-02-16 22:51:24 +0000
73+++ tests/vmtests/test_iscsi.py 2017-05-11 13:54:53 +0000
74@@ -49,3 +49,7 @@
75
76 class ZestyTestIscsiBasic(relbase.zesty, TestBasicIscsiAbs):
77 __test__ = True
78+
79+
80+class ArtfulTestIscsiBasic(relbase.artful, TestBasicIscsiAbs):
81+ __test__ = True
82
83=== modified file 'tests/vmtests/test_lvm.py'
84--- tests/vmtests/test_lvm.py 2017-02-01 20:32:13 +0000
85+++ tests/vmtests/test_lvm.py 2017-05-11 13:54:53 +0000
86@@ -88,3 +88,7 @@
87
88 class ZestyTestLvm(relbase.zesty, TestLvmAbs):
89 __test__ = True
90+
91+
92+class ArtfulTestLvm(relbase.artful, TestLvmAbs):
93+ __test__ = True
94
95=== modified file 'tests/vmtests/test_mdadm_bcache.py'
96--- tests/vmtests/test_mdadm_bcache.py 2017-04-13 20:47:15 +0000
97+++ tests/vmtests/test_mdadm_bcache.py 2017-05-11 13:54:53 +0000
98@@ -149,6 +149,10 @@
99 __test__ = True
100
101
102+class ArtfulTestMdadmBcache(relbase.artful, TestMdadmBcacheAbs):
103+ __test__ = True
104+
105+
106 class TestMirrorbootAbs(TestMdadmAbs):
107 # alternative config for more complex setup
108 conf_file = "examples/tests/mirrorboot.yaml"
109@@ -194,6 +198,10 @@
110 __test__ = True
111
112
113+class ArtfulTestMirrorboot(relbase.artful, TestMirrorbootAbs):
114+ __test__ = True
115+
116+
117 class TestMirrorbootPartitionsAbs(TestMdadmAbs):
118 # alternative config for more complex setup
119 conf_file = "examples/tests/mirrorboot-msdos-partition.yaml"
120@@ -238,6 +246,11 @@
121 __test__ = True
122
123
124+class ArtfulTestMirrorbootPartitions(relbase.artful,
125+ TestMirrorbootPartitionsAbs):
126+ __test__ = True
127+
128+
129 class TestMirrorbootPartitionsUEFIAbs(TestMdadmAbs):
130 # alternative config for more complex setup
131 conf_file = "examples/tests/mirrorboot-uefi.yaml"
132@@ -274,6 +287,11 @@
133 __test__ = True
134
135
136+class ArtfulTestMirrorbootPartitionsUEFI(relbase.artful,
137+ TestMirrorbootPartitionsUEFIAbs):
138+ __test__ = True
139+
140+
141 class TestRaid5bootAbs(TestMdadmAbs):
142 # alternative config for more complex setup
143 conf_file = "examples/tests/raid5boot.yaml"
144@@ -320,6 +338,10 @@
145 __test__ = True
146
147
148+class ArtfulTestRaid5boot(relbase.artful, TestRaid5bootAbs):
149+ __test__ = True
150+
151+
152 class TestRaid6bootAbs(TestMdadmAbs):
153 # alternative config for more complex setup
154 conf_file = "examples/tests/raid6boot.yaml"
155@@ -378,6 +400,10 @@
156 __test__ = True
157
158
159+class ArtfulTestRaid6boot(relbase.artful, TestRaid6bootAbs):
160+ __test__ = True
161+
162+
163 class TestRaid10bootAbs(TestMdadmAbs):
164 # alternative config for more complex setup
165 conf_file = "examples/tests/raid10boot.yaml"
166@@ -424,6 +450,10 @@
167 __test__ = True
168
169
170+class ArtfulTestRaid10boot(relbase.artful, TestRaid10bootAbs):
171+ __test__ = True
172+
173+
174 class TestAllindataAbs(TestMdadmAbs):
175 # more complex, needs more time
176 # alternative config for more complex setup
177@@ -525,3 +555,7 @@
178
179 class ZestyTestAllindata(relbase.zesty, TestAllindataAbs):
180 __test__ = True
181+
182+
183+class ArtfulTestAllindata(relbase.artful, TestAllindataAbs):
184+ __test__ = True
185
186=== modified file 'tests/vmtests/test_multipath.py'
187--- tests/vmtests/test_multipath.py 2017-02-07 16:52:56 +0000
188+++ tests/vmtests/test_multipath.py 2017-05-11 13:54:53 +0000
189@@ -62,3 +62,7 @@
190
191 class ZestyTestMultipathBasic(relbase.zesty, TestMultipathBasicAbs):
192 __test__ = True
193+
194+
195+class ArtfulTestMultipathBasic(relbase.artful, TestMultipathBasicAbs):
196+ __test__ = True
197
198=== modified file 'tests/vmtests/test_network.py'
199--- tests/vmtests/test_network.py 2017-02-01 20:32:13 +0000
200+++ tests/vmtests/test_network.py 2017-05-11 13:54:53 +0000
201@@ -337,3 +337,7 @@
202
203 class ZestyTestNetworkBasic(relbase.zesty, TestNetworkBasicAbs):
204 __test__ = True
205+
206+
207+class ArtfulTestNetworkBasic(relbase.artful, TestNetworkBasicAbs):
208+ __test__ = True
209
210=== modified file 'tests/vmtests/test_network_alias.py'
211--- tests/vmtests/test_network_alias.py 2017-02-07 16:52:56 +0000
212+++ tests/vmtests/test_network_alias.py 2017-05-11 13:54:53 +0000
213@@ -46,3 +46,7 @@
214
215 class ZestyTestNetworkAlias(relbase.zesty, TestNetworkAliasAbs):
216 __test__ = True
217+
218+
219+class ArtfulTestNetworkAlias(relbase.artful, TestNetworkAliasAbs):
220+ __test__ = True
221
222=== modified file 'tests/vmtests/test_network_bonding.py'
223--- tests/vmtests/test_network_bonding.py 2017-02-07 16:52:56 +0000
224+++ tests/vmtests/test_network_bonding.py 2017-05-11 13:54:53 +0000
225@@ -67,3 +67,7 @@
226
227 class ZestyTestBonding(relbase.zesty, TestNetworkBondingAbs):
228 __test__ = True
229+
230+
231+class ArtfulTestBonding(relbase.artful, TestNetworkBondingAbs):
232+ __test__ = True
233
234=== modified file 'tests/vmtests/test_network_bridging.py'
235--- tests/vmtests/test_network_bridging.py 2017-02-08 20:51:48 +0000
236+++ tests/vmtests/test_network_bridging.py 2017-05-11 13:54:53 +0000
237@@ -182,3 +182,7 @@
238
239 class ZestyTestBridging(relbase.zesty, TestBridgeNetworkAbs):
240 __test__ = True
241+
242+
243+class ArtfulTestBridging(relbase.artful, TestBridgeNetworkAbs):
244+ __test__ = True
245
246=== modified file 'tests/vmtests/test_network_enisource.py'
247--- tests/vmtests/test_network_enisource.py 2017-02-07 16:52:56 +0000
248+++ tests/vmtests/test_network_enisource.py 2017-05-11 13:54:53 +0000
249@@ -98,3 +98,7 @@
250
251 class ZestyTestNetworkENISource(relbase.zesty, TestNetworkENISource):
252 __test__ = True
253+
254+
255+class ArtfulTestNetworkENISource(relbase.artful, TestNetworkENISource):
256+ __test__ = True
257
258=== modified file 'tests/vmtests/test_network_ipv6.py'
259--- tests/vmtests/test_network_ipv6.py 2017-02-07 16:52:56 +0000
260+++ tests/vmtests/test_network_ipv6.py 2017-05-11 13:54:53 +0000
261@@ -55,3 +55,7 @@
262
263 class ZestyTestNetworkIPV6(relbase.zesty, TestNetworkIPV6Abs):
264 __test__ = True
265+
266+
267+class ArtfulTestNetworkIPV6(relbase.artful, TestNetworkIPV6Abs):
268+ __test__ = True
269
270=== modified file 'tests/vmtests/test_network_ipv6_enisource.py'
271--- tests/vmtests/test_network_ipv6_enisource.py 2017-02-07 16:52:56 +0000
272+++ tests/vmtests/test_network_ipv6_enisource.py 2017-05-11 13:54:53 +0000
273@@ -31,6 +31,9 @@
274 __test__ = True
275
276
277-class ZestyTestNetworkIPV6ENISource(relbase.zesty,
278- TestNetworkIPV6ENISource):
279+class ZestyTestNetworkIPV6ENISource(relbase.zesty, TestNetworkIPV6ENISource):
280+ __test__ = True
281+
282+
283+class ArtfulTestNetworkIPV6ENISource(relbase.artful, TestNetworkIPV6ENISource):
284 __test__ = True
285
286=== modified file 'tests/vmtests/test_network_ipv6_static.py'
287--- tests/vmtests/test_network_ipv6_static.py 2017-02-01 20:32:13 +0000
288+++ tests/vmtests/test_network_ipv6_static.py 2017-05-11 13:54:53 +0000
289@@ -49,3 +49,7 @@
290
291 class ZestyTestNetworkIPV6Static(relbase.zesty, TestNetworkIPV6StaticAbs):
292 __test__ = True
293+
294+
295+class ArtfulTestNetworkIPV6Static(relbase.artful, TestNetworkIPV6StaticAbs):
296+ __test__ = True
297
298=== modified file 'tests/vmtests/test_network_ipv6_vlan.py'
299--- tests/vmtests/test_network_ipv6_vlan.py 2017-02-07 16:52:56 +0000
300+++ tests/vmtests/test_network_ipv6_vlan.py 2017-05-11 13:54:53 +0000
301@@ -41,3 +41,7 @@
302
303 class ZestyTestNetworkIPV6Vlan(relbase.zesty, TestNetworkIPV6VlanAbs):
304 __test__ = True
305+
306+
307+class ArtfulTestNetworkIPV6Vlan(relbase.artful, TestNetworkIPV6VlanAbs):
308+ __test__ = True
309
310=== modified file 'tests/vmtests/test_network_mtu.py'
311--- tests/vmtests/test_network_mtu.py 2017-02-01 20:32:13 +0000
312+++ tests/vmtests/test_network_mtu.py 2017-05-11 13:54:53 +0000
313@@ -161,3 +161,7 @@
314
315 class ZestyTestNetworkMtu(relbase.zesty, TestNetworkMtuAbs):
316 __test__ = True
317+
318+
319+class ArtfulTestNetworkMtu(relbase.artful, TestNetworkMtuAbs):
320+ __test__ = True
321
322=== modified file 'tests/vmtests/test_network_static.py'
323--- tests/vmtests/test_network_static.py 2017-02-07 16:52:56 +0000
324+++ tests/vmtests/test_network_static.py 2017-05-11 13:54:53 +0000
325@@ -47,3 +47,11 @@
326
327 class YakketyTestNetworkStatic(relbase.yakkety, TestNetworkStaticAbs):
328 __test__ = True
329+
330+
331+class ZestyTestNetworkStatic(relbase.zesty, TestNetworkStaticAbs):
332+ __test__ = True
333+
334+
335+class ArtfulTestNetworkStatic(relbase.artful, TestNetworkStaticAbs):
336+ __test__ = True
337
338=== modified file 'tests/vmtests/test_network_static_routes.py'
339--- tests/vmtests/test_network_static_routes.py 2017-01-25 19:01:16 +0000
340+++ tests/vmtests/test_network_static_routes.py 2017-05-11 13:54:53 +0000
341@@ -48,3 +48,12 @@
342 class YakketyTestNetworkStaticRoutes(relbase.yakkety,
343 TestNetworkStaticRoutesAbs):
344 __test__ = True
345+
346+
347+class ZestyTestNetworkStaticRoutes(relbase.zesty, TestNetworkStaticRoutesAbs):
348+ __test__ = True
349+
350+
351+class ArtfulTestNetworkStaticRoutes(relbase.artful,
352+ TestNetworkStaticRoutesAbs):
353+ __test__ = True
354
355=== modified file 'tests/vmtests/test_network_vlan.py'
356--- tests/vmtests/test_network_vlan.py 2017-02-07 16:52:56 +0000
357+++ tests/vmtests/test_network_vlan.py 2017-05-11 13:54:53 +0000
358@@ -79,3 +79,11 @@
359
360 class YakketyTestNetworkVlan(relbase.yakkety, TestNetworkVlanAbs):
361 __test__ = True
362+
363+
364+class ZestyTestNetworkVlan(relbase.zesty, TestNetworkVlanAbs):
365+ __test__ = True
366+
367+
368+class ArtfulTestNetworkVlan(relbase.artful, TestNetworkVlanAbs):
369+ __test__ = True
370
371=== modified file 'tests/vmtests/test_nvme.py'
372--- tests/vmtests/test_nvme.py 2017-04-10 16:50:47 +0000
373+++ tests/vmtests/test_nvme.py 2017-05-11 13:54:53 +0000
374@@ -101,6 +101,10 @@
375 __test__ = True
376
377
378+class ArtfulTestNvme(relbase.artful, TestNvmeAbs):
379+ __test__ = True
380+
381+
382 class TestNvmeBcacheAbs(VMBaseClass):
383 arch_skip = [
384 "s390x", # nvme is a pci device, no pci on s390x
385@@ -176,3 +180,7 @@
386
387 class ZestyTestNvmeBcache(relbase.zesty, TestNvmeBcacheAbs):
388 __test__ = True
389+
390+
391+class ArtfulTestNvmeBcache(relbase.artful, TestNvmeBcacheAbs):
392+ __test__ = True
393
394=== modified file 'tests/vmtests/test_raid5_bcache.py'
395--- tests/vmtests/test_raid5_bcache.py 2017-02-07 16:52:56 +0000
396+++ tests/vmtests/test_raid5_bcache.py 2017-05-11 13:54:53 +0000
397@@ -109,3 +109,7 @@
398
399 class ZestyTestRaid5Bcache(relbase.zesty, TestMdadmBcacheAbs):
400 __test__ = True
401+
402+
403+class ArtfulTestRaid5Bcache(relbase.artful, TestMdadmBcacheAbs):
404+ __test__ = True
405
406=== modified file 'tests/vmtests/test_simple.py'
407--- tests/vmtests/test_simple.py 2017-01-27 22:05:39 +0000
408+++ tests/vmtests/test_simple.py 2017-05-11 13:54:53 +0000
409@@ -46,3 +46,7 @@
410
411 class ZestyTestSimple(relbase.zesty, TestSimple):
412 __test__ = True
413+
414+
415+class ArtfulTestSimple(relbase.artful, TestSimple):
416+ __test__ = True
417
418=== modified file 'tests/vmtests/test_uefi_basic.py'
419--- tests/vmtests/test_uefi_basic.py 2017-02-07 16:52:56 +0000
420+++ tests/vmtests/test_uefi_basic.py 2017-05-11 13:54:53 +0000
421@@ -120,6 +120,10 @@
422 __test__ = True
423
424
425+class ArtfulUefiTestBasic(relbase.artful, TestBasicAbs):
426+ __test__ = True
427+
428+
429 class PreciseUefiTestBasic4k(PreciseUefiTestBasic):
430 disk_block_size = 4096
431
432@@ -148,3 +152,7 @@
433
434 class ZestyUefiTestBasic4k(ZestyUefiTestBasic):
435 disk_block_size = 4096
436+
437+
438+class ArtfulUefiTestBasic4k(ArtfulUefiTestBasic):
439+ disk_block_size = 4096

Subscribers

People subscribed via source and target branches