curtin

Merge ~raharper/curtin:fix/vmtest-drop-cosmic into curtin:master

  1. Git
  2. lp:~raharper/curtin
  3. fix/vmtest-drop-cosmic
  4. Merge into master
Proposed by Ryan Harper
Status: Merged
Approved by: Ryan Harper
Approved revision: 4ecbc7a6cedef93a8df92ba3dc7239f0434ea678
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~raharper/curtin:fix/vmtest-drop-cosmic
Merge into: curtin:master
Diff against target: 669 lines (+0/-201)
35 files modified
tests/vmtests/test_apt_config_cmd.py (+0/-4)
tests/vmtests/test_basic.py (+0/-8)
tests/vmtests/test_basic_dasd.py (+0/-7)
tests/vmtests/test_bcache_basic.py (+0/-4)
tests/vmtests/test_bcache_bug1718699.py (+0/-4)
tests/vmtests/test_bcache_ceph.py (+0/-4)
tests/vmtests/test_bcache_partitions.py (+0/-4)
tests/vmtests/test_fs_battery.py (+0/-4)
tests/vmtests/test_iscsi.py (+0/-4)
tests/vmtests/test_journald_reporter.py (+0/-4)
tests/vmtests/test_lvm.py (+0/-4)
tests/vmtests/test_lvm_iscsi.py (+0/-4)
tests/vmtests/test_lvm_raid.py (+0/-4)
tests/vmtests/test_mdadm_bcache.py (+0/-34)
tests/vmtests/test_mdadm_iscsi.py (+0/-4)
tests/vmtests/test_multipath.py (+0/-4)
tests/vmtests/test_network.py (+0/-4)
tests/vmtests/test_network_alias.py (+0/-4)
tests/vmtests/test_network_bonding.py (+0/-4)
tests/vmtests/test_network_bridging.py (+0/-4)
tests/vmtests/test_network_ipv6.py (+0/-4)
tests/vmtests/test_network_ipv6_static.py (+0/-4)
tests/vmtests/test_network_ipv6_vlan.py (+0/-4)
tests/vmtests/test_network_mtu.py (+0/-4)
tests/vmtests/test_network_static.py (+0/-4)
tests/vmtests/test_network_static_routes.py (+0/-5)
tests/vmtests/test_network_vlan.py (+0/-4)
tests/vmtests/test_nvme.py (+0/-8)
tests/vmtests/test_pollinate_useragent.py (+0/-4)
tests/vmtests/test_preserve.py (+0/-4)
tests/vmtests/test_preserve_raid.py (+0/-4)
tests/vmtests/test_raid5_bcache.py (+0/-4)
tests/vmtests/test_simple.py (+0/-14)
tests/vmtests/test_uefi_basic.py (+0/-9)
tests/vmtests/test_zfsroot.py (+0/-8)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Watkins (community) Approve
Review via email: mp+370712@code.launchpad.net

Commit message

vmtest: drop Cosmic test cases

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/curtin-autoland-test/206/
Executed test runs:
    None: https://jenkins.ubuntu.com/server/job/admin-lp-git-autoland/509/console

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

FAILED: Continuous integration, rev:4ecbc7a6cedef93a8df92ba3dc7239f0434ea678
https://jenkins.ubuntu.com/server/job/curtin-ci/1330/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1330/console
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1330
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1330
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1330

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

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

PASSED: Continuous integration, rev:4ecbc7a6cedef93a8df92ba3dc7239f0434ea678
https://jenkins.ubuntu.com/server/job/curtin-ci/1331/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1331
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1331
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1331
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1331

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
2index 13325e5..55677d9 100644
3--- a/tests/vmtests/test_apt_config_cmd.py
4+++ b/tests/vmtests/test_apt_config_cmd.py
5@@ -64,10 +64,6 @@ class BionicTestAptConfigCMDCMD(relbase.bionic, TestAptConfigCMD):
6 __test__ = True
7
8
9-class CosmicTestAptConfigCMDCMD(relbase.cosmic, TestAptConfigCMD):
10- __test__ = True
11-
12-
13 class DiscoTestAptConfigCMDCMD(relbase.disco, TestAptConfigCMD):
14 __test__ = True
15
16diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
17index 3e594fe..4d5008c 100644
18--- a/tests/vmtests/test_basic.py
19+++ b/tests/vmtests/test_basic.py
20@@ -283,10 +283,6 @@ class BionicTestBasic(relbase.bionic, TestBasicAbs):
21 __test__ = True
22
23
24-class CosmicTestBasic(relbase.cosmic, TestBasicAbs):
25- __test__ = True
26-
27-
28 class DiscoTestBasic(relbase.disco, TestBasicAbs):
29 __test__ = True
30
31@@ -371,10 +367,6 @@ class BionicTestScsiBasic(relbase.bionic, TestBasicScsiAbs):
32 __test__ = True
33
34
35-class CosmicTestScsiBasic(relbase.cosmic, TestBasicScsiAbs):
36- __test__ = True
37-
38-
39 class DiscoTestScsiBasic(relbase.disco, TestBasicScsiAbs):
40 __test__ = True
41
42diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
43index 763bc9c..9b200e2 100644
44--- a/tests/vmtests/test_basic_dasd.py
45+++ b/tests/vmtests/test_basic_dasd.py
46@@ -53,13 +53,6 @@ class BionicTestBasicDasd(relbase.bionic, TestBasicDasd):
47 self.output_files_exist(["netplan.yaml"])
48
49
50-class CosmicTestBasicDasd(relbase.cosmic, TestBasicDasd):
51- __test__ = True
52-
53- def test_output_files_exist(self):
54- self.output_files_exist(["netplan.yaml"])
55-
56-
57 class DiscoTestBasicDasd(relbase.disco, TestBasicDasd):
58 __test__ = True
59
60diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
61index 12ed8f6..d3ece67 100644
62--- a/tests/vmtests/test_bcache_basic.py
63+++ b/tests/vmtests/test_bcache_basic.py
64@@ -64,10 +64,6 @@ class BionicBcacheBasic(relbase.bionic, TestBcacheBasic):
65 __test__ = True
66
67
68-class CosmicBcacheBasic(relbase.cosmic, TestBcacheBasic):
69- __test__ = True
70-
71-
72 class DiscoBcacheBasic(relbase.disco, TestBcacheBasic):
73 __test__ = True
74
75diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
76index e6c66fc..b42a943 100644
77--- a/tests/vmtests/test_bcache_bug1718699.py
78+++ b/tests/vmtests/test_bcache_bug1718699.py
79@@ -19,10 +19,6 @@ class BionicTestBcacheBug1718699(relbase.bionic, TestBcacheBug1718699):
80 __test__ = True
81
82
83-class CosmicTestBcacheBug1718699(relbase.cosmic, TestBcacheBug1718699):
84- __test__ = True
85-
86-
87 class DiscoTestBcacheBug1718699(relbase.disco, TestBcacheBug1718699):
88 __test__ = True
89
90diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
91index b8b1d9c..c35ee85 100644
92--- a/tests/vmtests/test_bcache_ceph.py
93+++ b/tests/vmtests/test_bcache_ceph.py
94@@ -75,10 +75,6 @@ class BionicTestBcacheCeph(relbase.bionic, TestBcacheCeph):
95 __test__ = True
96
97
98-class CosmicTestBcacheCeph(relbase.cosmic, TestBcacheCeph):
99- __test__ = True
100-
101-
102 class DiscoTestBcacheCeph(relbase.disco, TestBcacheCeph):
103 __test__ = True
104
105diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
106index 46dbc88..161ca07 100644
107--- a/tests/vmtests/test_bcache_partitions.py
108+++ b/tests/vmtests/test_bcache_partitions.py
109@@ -25,10 +25,6 @@ class BionicTestBcachePartitions(relbase.bionic, TestBcachePartitions):
110 __test__ = True
111
112
113-class CosmicTestBcachePartitions(relbase.cosmic, TestBcachePartitions):
114- __test__ = True
115-
116-
117 class DiscoTestBcachePartitions(relbase.disco, TestBcachePartitions):
118 __test__ = True
119
120diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
121index 94850aa..9b16fe9 100644
122--- a/tests/vmtests/test_fs_battery.py
123+++ b/tests/vmtests/test_fs_battery.py
124@@ -231,10 +231,6 @@ class BionicTestFsBattery(relbase.bionic, TestFsBattery):
125 __test__ = True
126
127
128-class CosmicTestFsBattery(relbase.cosmic, TestFsBattery):
129- __test__ = True
130-
131-
132 class DiscoTestFsBattery(relbase.disco, TestFsBattery):
133 __test__ = True
134
135diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
136index 3fb2be9..e8bcb46 100644
137--- a/tests/vmtests/test_iscsi.py
138+++ b/tests/vmtests/test_iscsi.py
139@@ -71,10 +71,6 @@ class BionicTestIscsiBasic(relbase.bionic, TestBasicIscsiAbs):
140 __test__ = True
141
142
143-class CosmicTestIscsiBasic(relbase.cosmic, TestBasicIscsiAbs):
144- __test__ = True
145-
146-
147 class DiscoTestIscsiBasic(relbase.disco, TestBasicIscsiAbs):
148 __test__ = True
149
150diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
151index 71d331c..36e3fb0 100644
152--- a/tests/vmtests/test_journald_reporter.py
153+++ b/tests/vmtests/test_journald_reporter.py
154@@ -36,10 +36,6 @@ class BionicTestJournaldReporter(relbase.bionic, TestJournaldReporter):
155 __test__ = True
156
157
158-class CosmicTestJournaldReporter(relbase.cosmic, TestJournaldReporter):
159- __test__ = True
160-
161-
162 class DiscoTestJournaldReporter(relbase.disco, TestJournaldReporter):
163 __test__ = True
164
165diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
166index 206b835..e95d767 100644
167--- a/tests/vmtests/test_lvm.py
168+++ b/tests/vmtests/test_lvm.py
169@@ -85,10 +85,6 @@ class BionicTestLvm(relbase.bionic, TestLvmAbs):
170 __test__ = True
171
172
173-class CosmicTestLvm(relbase.cosmic, TestLvmAbs):
174- __test__ = True
175-
176-
177 class DiscoTestLvm(relbase.disco, TestLvmAbs):
178 __test__ = True
179
180diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
181index e07338e..96f78b6 100644
182--- a/tests/vmtests/test_lvm_iscsi.py
183+++ b/tests/vmtests/test_lvm_iscsi.py
184@@ -85,10 +85,6 @@ class BionicTestIscsiLvm(relbase.bionic, TestLvmIscsiAbs):
185 __test__ = True
186
187
188-class CosmicTestIscsiLvm(relbase.cosmic, TestLvmIscsiAbs):
189- __test__ = True
190-
191-
192 class DiscoTestIscsiLvm(relbase.disco, TestLvmIscsiAbs):
193 __test__ = True
194
195diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
196index 362191a..c0ac6e8 100644
197--- a/tests/vmtests/test_lvm_raid.py
198+++ b/tests/vmtests/test_lvm_raid.py
199@@ -51,10 +51,6 @@ class DiscoTestLvmOverRaid(relbase.disco, TestLvmOverRaidAbs):
200 __test__ = True
201
202
203-class CosmicTestLvmOverRaid(relbase.cosmic, TestLvmOverRaidAbs):
204- __test__ = True
205-
206-
207 class BionicTestLvmOverRaid(relbase.bionic, TestLvmOverRaidAbs):
208 __test__ = True
209
210diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
211index 6f8bea7..1c2396b 100644
212--- a/tests/vmtests/test_mdadm_bcache.py
213+++ b/tests/vmtests/test_mdadm_bcache.py
214@@ -143,10 +143,6 @@ class BionicTestMdadmBcache(relbase.bionic, TestMdadmBcacheAbs):
215 __test__ = True
216
217
218-class CosmicTestMdadmBcache(relbase.cosmic, TestMdadmBcacheAbs):
219- __test__ = True
220-
221-
222 class DiscoTestMdadmBcache(relbase.disco, TestMdadmBcacheAbs):
223 __test__ = True
224
225@@ -187,10 +183,6 @@ class BionicTestMirrorboot(relbase.bionic, TestMirrorbootAbs):
226 __test__ = True
227
228
229-class CosmicTestMirrorboot(relbase.cosmic, TestMirrorbootAbs):
230- __test__ = True
231-
232-
233 class DiscoTestMirrorboot(relbase.disco, TestMirrorbootAbs):
234 __test__ = True
235
236@@ -234,11 +226,6 @@ class BionicTestMirrorbootPartitions(relbase.bionic,
237 __test__ = True
238
239
240-class CosmicTestMirrorbootPartitions(relbase.cosmic,
241- TestMirrorbootPartitionsAbs):
242- __test__ = True
243-
244-
245 class DiscoTestMirrorbootPartitions(relbase.disco,
246 TestMirrorbootPartitionsAbs):
247 __test__ = True
248@@ -289,11 +276,6 @@ class BionicTestMirrorbootPartitionsUEFI(relbase.bionic,
249 __test__ = True
250
251
252-class CosmicTestMirrorbootPartitionsUEFI(relbase.cosmic,
253- TestMirrorbootPartitionsUEFIAbs):
254- __test__ = True
255-
256-
257 class DiscoTestMirrorbootPartitionsUEFI(relbase.disco,
258 TestMirrorbootPartitionsUEFIAbs):
259 __test__ = True
260@@ -336,10 +318,6 @@ class BionicTestRaid5boot(relbase.bionic, TestRaid5bootAbs):
261 __test__ = True
262
263
264-class CosmicTestRaid5boot(relbase.cosmic, TestRaid5bootAbs):
265- __test__ = True
266-
267-
268 class DiscoTestRaid5boot(relbase.disco, TestRaid5bootAbs):
269 __test__ = True
270
271@@ -396,10 +374,6 @@ class BionicTestRaid6boot(relbase.bionic, TestRaid6bootAbs):
272 __test__ = True
273
274
275-class CosmicTestRaid6boot(relbase.cosmic, TestRaid6bootAbs):
276- __test__ = True
277-
278-
279 class DiscoTestRaid6boot(relbase.disco, TestRaid6bootAbs):
280 __test__ = True
281
282@@ -442,10 +416,6 @@ class BionicTestRaid10boot(relbase.bionic, TestRaid10bootAbs):
283 __test__ = True
284
285
286-class CosmicTestRaid10boot(relbase.cosmic, TestRaid10bootAbs):
287- __test__ = True
288-
289-
290 class DiscoTestRaid10boot(relbase.disco, TestRaid10bootAbs):
291 __test__ = True
292
293@@ -546,10 +516,6 @@ class BionicTestAllindata(relbase.bionic, TestAllindataAbs):
294 __test__ = True
295
296
297-class CosmicTestAllindata(relbase.cosmic, TestAllindataAbs):
298- __test__ = True
299-
300-
301 class DiscoTestAllindata(relbase.disco, TestAllindataAbs):
302 __test__ = True
303
304diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
305index fa8d88f..cd465c7 100644
306--- a/tests/vmtests/test_mdadm_iscsi.py
307+++ b/tests/vmtests/test_mdadm_iscsi.py
308@@ -50,10 +50,6 @@ class BionicTestIscsiMdadm(relbase.bionic, TestMdadmIscsiAbs):
309 __test__ = True
310
311
312-class CosmicTestIscsiMdadm(relbase.cosmic, TestMdadmIscsiAbs):
313- __test__ = True
314-
315-
316 class DiscoTestIscsiMdadm(relbase.disco, TestMdadmIscsiAbs):
317 __test__ = True
318
319diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
320index 8d25d57..e0b68ec 100644
321--- a/tests/vmtests/test_multipath.py
322+++ b/tests/vmtests/test_multipath.py
323@@ -80,10 +80,6 @@ class BionicTestMultipathBasic(relbase.bionic, TestMultipathBasicAbs):
324 __test__ = True
325
326
327-class CosmicTestMultipathBasic(relbase.cosmic, TestMultipathBasicAbs):
328- __test__ = True
329-
330-
331 class DiscoTestMultipathBasic(relbase.disco, TestMultipathBasicAbs):
332 __test__ = True
333
334diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
335index f28b2c9..6d3047c 100644
336--- a/tests/vmtests/test_network.py
337+++ b/tests/vmtests/test_network.py
338@@ -472,10 +472,6 @@ class BionicTestNetworkBasic(relbase.bionic, TestNetworkBasicAbs):
339 __test__ = True
340
341
342-class CosmicTestNetworkBasic(relbase.cosmic, TestNetworkBasicAbs):
343- __test__ = True
344-
345-
346 class DiscoTestNetworkBasic(relbase.disco, TestNetworkBasicAbs):
347 __test__ = True
348
349diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
350index fb4fb2c..995d982 100644
351--- a/tests/vmtests/test_network_alias.py
352+++ b/tests/vmtests/test_network_alias.py
353@@ -52,10 +52,6 @@ class BionicTestNetworkAlias(relbase.bionic, TestNetworkAliasAbs):
354 __test__ = True
355
356
357-class CosmicTestNetworkAlias(relbase.cosmic, TestNetworkAliasAbs):
358- __test__ = True
359-
360-
361 class DiscoTestNetworkAlias(relbase.disco, TestNetworkAliasAbs):
362 __test__ = True
363
364diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
365index a66591a..ec7b48c 100644
366--- a/tests/vmtests/test_network_bonding.py
367+++ b/tests/vmtests/test_network_bonding.py
368@@ -57,10 +57,6 @@ class BionicTestBonding(relbase.bionic, TestNetworkBondingAbs):
369 __test__ = True
370
371
372-class CosmicTestBonding(relbase.cosmic, TestNetworkBondingAbs):
373- __test__ = True
374-
375-
376 class DiscoTestBonding(relbase.disco, TestNetworkBondingAbs):
377 __test__ = True
378
379diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
380index b3ec287..c29bd33 100644
381--- a/tests/vmtests/test_network_bridging.py
382+++ b/tests/vmtests/test_network_bridging.py
383@@ -236,10 +236,6 @@ class BionicTestBridging(relbase.bionic, TestBridgeNetworkAbs):
384 __test__ = True
385
386
387-class CosmicTestBridging(relbase.cosmic, TestBridgeNetworkAbs):
388- __test__ = True
389-
390-
391 class DiscoTestBridging(relbase.disco, TestBridgeNetworkAbs):
392 __test__ = True
393
394diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
395index 9b6acc9..e0a39a0 100644
396--- a/tests/vmtests/test_network_ipv6.py
397+++ b/tests/vmtests/test_network_ipv6.py
398@@ -53,10 +53,6 @@ class BionicTestNetworkIPV6(relbase.bionic, TestNetworkIPV6Abs):
399 __test__ = True
400
401
402-class CosmicTestNetworkIPV6(relbase.cosmic, TestNetworkIPV6Abs):
403- __test__ = True
404-
405-
406 class DiscoTestNetworkIPV6(relbase.disco, TestNetworkIPV6Abs):
407 __test__ = True
408
409diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
410index b79b9e4..925cc79 100644
411--- a/tests/vmtests/test_network_ipv6_static.py
412+++ b/tests/vmtests/test_network_ipv6_static.py
413@@ -23,10 +23,6 @@ class BionicTestNetworkIPV6Static(relbase.bionic, TestNetworkIPV6StaticAbs):
414 __test__ = True
415
416
417-class CosmicTestNetworkIPV6Static(relbase.cosmic, TestNetworkIPV6StaticAbs):
418- __test__ = True
419-
420-
421 class DiscoTestNetworkIPV6Static(relbase.disco, TestNetworkIPV6StaticAbs):
422 __test__ = True
423
424diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
425index 138ea6a..7ae5912 100644
426--- a/tests/vmtests/test_network_ipv6_vlan.py
427+++ b/tests/vmtests/test_network_ipv6_vlan.py
428@@ -22,10 +22,6 @@ class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
429 __test__ = True
430
431
432-class CosmicTestNetworkIPV6Vlan(relbase.cosmic, TestNetworkIPV6VlanAbs):
433- __test__ = True
434-
435-
436 class DiscoTestNetworkIPV6Vlan(relbase.disco, TestNetworkIPV6VlanAbs):
437 __test__ = True
438
439diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
440index 30cc2c8..7b94c58 100644
441--- a/tests/vmtests/test_network_mtu.py
442+++ b/tests/vmtests/test_network_mtu.py
443@@ -171,10 +171,6 @@ class BionicTestNetworkMtu(relbase.bionic, TestNetworkMtuAbs):
444
445
446 @TestNetworkMtuAbs.skip_by_date("1671951", fixby="2019-10-02")
447-class CosmicTestNetworkMtu(relbase.cosmic, TestNetworkMtuAbs):
448- __test__ = True
449-
450-
451 @TestNetworkMtuAbs.skip_by_date("1671951", fixby="2019-10-02")
452 class DiscoTestNetworkMtu(relbase.disco, TestNetworkMtuAbs):
453 __test__ = True
454diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
455index 9706a2d..01f30d5 100644
456--- a/tests/vmtests/test_network_static.py
457+++ b/tests/vmtests/test_network_static.py
458@@ -28,10 +28,6 @@ class BionicTestNetworkStatic(relbase.bionic, TestNetworkStaticAbs):
459 __test__ = True
460
461
462-class CosmicTestNetworkStatic(relbase.cosmic, TestNetworkStaticAbs):
463- __test__ = True
464-
465-
466 class DiscoTestNetworkStatic(relbase.disco, TestNetworkStaticAbs):
467 __test__ = True
468
469diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
470index b441bc9..5a8969c 100644
471--- a/tests/vmtests/test_network_static_routes.py
472+++ b/tests/vmtests/test_network_static_routes.py
473@@ -28,11 +28,6 @@ class BionicTestNetworkStaticRoutes(relbase.bionic,
474 __test__ = True
475
476
477-class CosmicTestNetworkStaticRoutes(relbase.cosmic,
478- TestNetworkStaticRoutesAbs):
479- __test__ = True
480-
481-
482 class DiscoTestNetworkStaticRoutes(relbase.disco,
483 TestNetworkStaticRoutesAbs):
484 __test__ = True
485diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
486index 88e3d35..843f11e 100644
487--- a/tests/vmtests/test_network_vlan.py
488+++ b/tests/vmtests/test_network_vlan.py
489@@ -76,10 +76,6 @@ class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
490 __test__ = True
491
492
493-class CosmicTestNetworkVlan(relbase.cosmic, TestNetworkVlanAbs):
494- __test__ = True
495-
496-
497 class DiscoTestNetworkVlan(relbase.disco, TestNetworkVlanAbs):
498 __test__ = True
499
500diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
501index 730057e..bcd5c09 100644
502--- a/tests/vmtests/test_nvme.py
503+++ b/tests/vmtests/test_nvme.py
504@@ -73,10 +73,6 @@ class BionicTestNvme(relbase.bionic, TestNvmeAbs):
505 __test__ = True
506
507
508-class CosmicTestNvme(relbase.cosmic, TestNvmeAbs):
509- __test__ = True
510-
511-
512 class DiscoTestNvme(relbase.disco, TestNvmeAbs):
513 __test__ = True
514
515@@ -147,10 +143,6 @@ class BionicTestNvmeBcache(relbase.bionic, TestNvmeBcacheAbs):
516 __test__ = True
517
518
519-class CosmicTestNvmeBcache(relbase.cosmic, TestNvmeBcacheAbs):
520- __test__ = True
521-
522-
523 class DiscoTestNvmeBcache(relbase.disco, TestNvmeBcacheAbs):
524 __test__ = True
525
526diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
527index d9d9d9d..f01add2 100644
528--- a/tests/vmtests/test_pollinate_useragent.py
529+++ b/tests/vmtests/test_pollinate_useragent.py
530@@ -61,10 +61,6 @@ class BionicTestPollinateUserAgent(relbase.bionic, TestPollinateUserAgent):
531 __test__ = True
532
533
534-class CosmicTestPollinateUserAgent(relbase.cosmic, TestPollinateUserAgent):
535- __test__ = True
536-
537-
538 class DiscoTestPollinateUserAgent(relbase.disco, TestPollinateUserAgent):
539 __test__ = True
540
541diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
542index 2387aa4..434b71d 100644
543--- a/tests/vmtests/test_preserve.py
544+++ b/tests/vmtests/test_preserve.py
545@@ -25,10 +25,6 @@ class BionicTestPreserve(relbase.bionic, TestPreserve):
546 __test__ = True
547
548
549-class CosmicTestPreserve(relbase.cosmic, TestPreserve):
550- __test__ = True
551-
552-
553 class DiscoTestPreserve(relbase.disco, TestPreserve):
554 __test__ = True
555
556diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
557index cf2b808..678f893 100644
558--- a/tests/vmtests/test_preserve_raid.py
559+++ b/tests/vmtests/test_preserve_raid.py
560@@ -25,10 +25,6 @@ class BionicTestPreserveRAID(relbase.bionic, TestPreserveRAID):
561 __test__ = True
562
563
564-class CosmicTestPreserveRAID(relbase.cosmic, TestPreserveRAID):
565- __test__ = True
566-
567-
568 class DiscoTestPreserveRAID(relbase.disco, TestPreserveRAID):
569 __test__ = True
570
571diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
572index 67a794d..90549b2 100644
573--- a/tests/vmtests/test_raid5_bcache.py
574+++ b/tests/vmtests/test_raid5_bcache.py
575@@ -83,10 +83,6 @@ class BionicTestRaid5Bcache(relbase.bionic, TestMdadmBcacheAbs):
576 __test__ = True
577
578
579-class CosmicTestRaid5Bcache(relbase.cosmic, TestMdadmBcacheAbs):
580- __test__ = True
581-
582-
583 class DiscoTestRaid5Bcache(relbase.disco, TestMdadmBcacheAbs):
584 __test__ = True
585
586diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
587index b529c88..8c46af7 100644
588--- a/tests/vmtests/test_simple.py
589+++ b/tests/vmtests/test_simple.py
590@@ -49,13 +49,6 @@ class BionicTestSimple(relbase.bionic, TestSimple):
591 self.output_files_exist(["netplan.yaml"])
592
593
594-class CosmicTestSimple(relbase.cosmic, TestSimple):
595- __test__ = True
596-
597- def test_output_files_exist(self):
598- self.output_files_exist(["netplan.yaml"])
599-
600-
601 class DiscoTestSimple(relbase.disco, TestSimple):
602 __test__ = True
603
604@@ -112,13 +105,6 @@ class BionicTestSimpleStorage(relbase.bionic, TestSimpleStorage):
605 self.output_files_exist(["netplan.yaml"])
606
607
608-class CosmicTestSimpleStorage(relbase.cosmic, TestSimpleStorage):
609- __test__ = True
610-
611- def test_output_files_exist(self):
612- self.output_files_exist(["netplan.yaml"])
613-
614-
615 class DiscoTestSimpleStorage(relbase.disco, TestSimpleStorage):
616 __test__ = True
617
618diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
619index 51696c2..d28d12d 100644
620--- a/tests/vmtests/test_uefi_basic.py
621+++ b/tests/vmtests/test_uefi_basic.py
622@@ -105,10 +105,6 @@ class BionicUefiTestBasic(relbase.bionic, TestBasicAbs):
623 __test__ = True
624
625
626-class CosmicUefiTestBasic(relbase.cosmic, TestBasicAbs):
627- __test__ = True
628-
629-
630 class DiscoUefiTestBasic(relbase.disco, TestBasicAbs):
631 __test__ = True
632
633@@ -132,11 +128,6 @@ class BionicUefiTestBasic4k(relbase.bionic, TestBasicAbs):
634 disk_block_size = 4096
635
636
637-class CosmicUefiTestBasic4k(relbase.cosmic, TestBasicAbs):
638- __test__ = True
639- disk_block_size = 4096
640-
641-
642 class DiscoUefiTestBasic4k(relbase.disco, TestBasicAbs):
643 __test__ = True
644 disk_block_size = 4096
645diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
646index ac35a4e..8956f50 100644
647--- a/tests/vmtests/test_zfsroot.py
648+++ b/tests/vmtests/test_zfsroot.py
649@@ -93,10 +93,6 @@ class BionicTestZfsRoot(relbase.bionic, TestZfsRootAbs):
650 __test__ = True
651
652
653-class CosmicTestZfsRoot(relbase.cosmic, TestZfsRootAbs):
654- __test__ = True
655-
656-
657 class DiscoTestZfsRoot(relbase.disco, TestZfsRootAbs):
658 __test__ = True
659
660@@ -123,10 +119,6 @@ class BionicTestZfsRootFsType(relbase.bionic, TestZfsRootFsTypeAbs):
661 __test__ = True
662
663
664-class CosmicTestZfsRootFsType(relbase.cosmic, TestZfsRootFsTypeAbs):
665- __test__ = True
666-
667-
668 class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):
669 __test__ = True
670

Subscribers

People subscribed via source and target branches