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
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index 13325e5..55677d9 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -64,10 +64,6 @@ class BionicTestAptConfigCMDCMD(relbase.bionic, TestAptConfigCMD):
64 __test__ = True64 __test__ = True
6565
6666
67class CosmicTestAptConfigCMDCMD(relbase.cosmic, TestAptConfigCMD):
68 __test__ = True
69
70
71class DiscoTestAptConfigCMDCMD(relbase.disco, TestAptConfigCMD):67class DiscoTestAptConfigCMDCMD(relbase.disco, TestAptConfigCMD):
72 __test__ = True68 __test__ = True
7369
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 3e594fe..4d5008c 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -283,10 +283,6 @@ class BionicTestBasic(relbase.bionic, TestBasicAbs):
283 __test__ = True283 __test__ = True
284284
285285
286class CosmicTestBasic(relbase.cosmic, TestBasicAbs):
287 __test__ = True
288
289
290class DiscoTestBasic(relbase.disco, TestBasicAbs):286class DiscoTestBasic(relbase.disco, TestBasicAbs):
291 __test__ = True287 __test__ = True
292288
@@ -371,10 +367,6 @@ class BionicTestScsiBasic(relbase.bionic, TestBasicScsiAbs):
371 __test__ = True367 __test__ = True
372368
373369
374class CosmicTestScsiBasic(relbase.cosmic, TestBasicScsiAbs):
375 __test__ = True
376
377
378class DiscoTestScsiBasic(relbase.disco, TestBasicScsiAbs):370class DiscoTestScsiBasic(relbase.disco, TestBasicScsiAbs):
379 __test__ = True371 __test__ = True
380372
diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
index 763bc9c..9b200e2 100644
--- a/tests/vmtests/test_basic_dasd.py
+++ b/tests/vmtests/test_basic_dasd.py
@@ -53,13 +53,6 @@ class BionicTestBasicDasd(relbase.bionic, TestBasicDasd):
53 self.output_files_exist(["netplan.yaml"])53 self.output_files_exist(["netplan.yaml"])
5454
5555
56class CosmicTestBasicDasd(relbase.cosmic, TestBasicDasd):
57 __test__ = True
58
59 def test_output_files_exist(self):
60 self.output_files_exist(["netplan.yaml"])
61
62
63class DiscoTestBasicDasd(relbase.disco, TestBasicDasd):56class DiscoTestBasicDasd(relbase.disco, TestBasicDasd):
64 __test__ = True57 __test__ = True
6558
diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
index 12ed8f6..d3ece67 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -64,10 +64,6 @@ class BionicBcacheBasic(relbase.bionic, TestBcacheBasic):
64 __test__ = True64 __test__ = True
6565
6666
67class CosmicBcacheBasic(relbase.cosmic, TestBcacheBasic):
68 __test__ = True
69
70
71class DiscoBcacheBasic(relbase.disco, TestBcacheBasic):67class DiscoBcacheBasic(relbase.disco, TestBcacheBasic):
72 __test__ = True68 __test__ = True
7369
diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
index e6c66fc..b42a943 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -19,10 +19,6 @@ class BionicTestBcacheBug1718699(relbase.bionic, TestBcacheBug1718699):
19 __test__ = True19 __test__ = True
2020
2121
22class CosmicTestBcacheBug1718699(relbase.cosmic, TestBcacheBug1718699):
23 __test__ = True
24
25
26class DiscoTestBcacheBug1718699(relbase.disco, TestBcacheBug1718699):22class DiscoTestBcacheBug1718699(relbase.disco, TestBcacheBug1718699):
27 __test__ = True23 __test__ = True
2824
diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
index b8b1d9c..c35ee85 100644
--- a/tests/vmtests/test_bcache_ceph.py
+++ b/tests/vmtests/test_bcache_ceph.py
@@ -75,10 +75,6 @@ class BionicTestBcacheCeph(relbase.bionic, TestBcacheCeph):
75 __test__ = True75 __test__ = True
7676
7777
78class CosmicTestBcacheCeph(relbase.cosmic, TestBcacheCeph):
79 __test__ = True
80
81
82class DiscoTestBcacheCeph(relbase.disco, TestBcacheCeph):78class DiscoTestBcacheCeph(relbase.disco, TestBcacheCeph):
83 __test__ = True79 __test__ = True
8480
diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
index 46dbc88..161ca07 100644
--- a/tests/vmtests/test_bcache_partitions.py
+++ b/tests/vmtests/test_bcache_partitions.py
@@ -25,10 +25,6 @@ class BionicTestBcachePartitions(relbase.bionic, TestBcachePartitions):
25 __test__ = True25 __test__ = True
2626
2727
28class CosmicTestBcachePartitions(relbase.cosmic, TestBcachePartitions):
29 __test__ = True
30
31
32class DiscoTestBcachePartitions(relbase.disco, TestBcachePartitions):28class DiscoTestBcachePartitions(relbase.disco, TestBcachePartitions):
33 __test__ = True29 __test__ = True
3430
diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
index 94850aa..9b16fe9 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -231,10 +231,6 @@ class BionicTestFsBattery(relbase.bionic, TestFsBattery):
231 __test__ = True231 __test__ = True
232232
233233
234class CosmicTestFsBattery(relbase.cosmic, TestFsBattery):
235 __test__ = True
236
237
238class DiscoTestFsBattery(relbase.disco, TestFsBattery):234class DiscoTestFsBattery(relbase.disco, TestFsBattery):
239 __test__ = True235 __test__ = True
240236
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index 3fb2be9..e8bcb46 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -71,10 +71,6 @@ class BionicTestIscsiBasic(relbase.bionic, TestBasicIscsiAbs):
71 __test__ = True71 __test__ = True
7272
7373
74class CosmicTestIscsiBasic(relbase.cosmic, TestBasicIscsiAbs):
75 __test__ = True
76
77
78class DiscoTestIscsiBasic(relbase.disco, TestBasicIscsiAbs):74class DiscoTestIscsiBasic(relbase.disco, TestBasicIscsiAbs):
79 __test__ = True75 __test__ = True
8076
diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
index 71d331c..36e3fb0 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -36,10 +36,6 @@ class BionicTestJournaldReporter(relbase.bionic, TestJournaldReporter):
36 __test__ = True36 __test__ = True
3737
3838
39class CosmicTestJournaldReporter(relbase.cosmic, TestJournaldReporter):
40 __test__ = True
41
42
43class DiscoTestJournaldReporter(relbase.disco, TestJournaldReporter):39class DiscoTestJournaldReporter(relbase.disco, TestJournaldReporter):
44 __test__ = True40 __test__ = True
4541
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index 206b835..e95d767 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -85,10 +85,6 @@ class BionicTestLvm(relbase.bionic, TestLvmAbs):
85 __test__ = True85 __test__ = True
8686
8787
88class CosmicTestLvm(relbase.cosmic, TestLvmAbs):
89 __test__ = True
90
91
92class DiscoTestLvm(relbase.disco, TestLvmAbs):88class DiscoTestLvm(relbase.disco, TestLvmAbs):
93 __test__ = True89 __test__ = True
9490
diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
index e07338e..96f78b6 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -85,10 +85,6 @@ class BionicTestIscsiLvm(relbase.bionic, TestLvmIscsiAbs):
85 __test__ = True85 __test__ = True
8686
8787
88class CosmicTestIscsiLvm(relbase.cosmic, TestLvmIscsiAbs):
89 __test__ = True
90
91
92class DiscoTestIscsiLvm(relbase.disco, TestLvmIscsiAbs):88class DiscoTestIscsiLvm(relbase.disco, TestLvmIscsiAbs):
93 __test__ = True89 __test__ = True
9490
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
index 362191a..c0ac6e8 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -51,10 +51,6 @@ class DiscoTestLvmOverRaid(relbase.disco, TestLvmOverRaidAbs):
51 __test__ = True51 __test__ = True
5252
5353
54class CosmicTestLvmOverRaid(relbase.cosmic, TestLvmOverRaidAbs):
55 __test__ = True
56
57
58class BionicTestLvmOverRaid(relbase.bionic, TestLvmOverRaidAbs):54class BionicTestLvmOverRaid(relbase.bionic, TestLvmOverRaidAbs):
59 __test__ = True55 __test__ = True
6056
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index 6f8bea7..1c2396b 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -143,10 +143,6 @@ class BionicTestMdadmBcache(relbase.bionic, TestMdadmBcacheAbs):
143 __test__ = True143 __test__ = True
144144
145145
146class CosmicTestMdadmBcache(relbase.cosmic, TestMdadmBcacheAbs):
147 __test__ = True
148
149
150class DiscoTestMdadmBcache(relbase.disco, TestMdadmBcacheAbs):146class DiscoTestMdadmBcache(relbase.disco, TestMdadmBcacheAbs):
151 __test__ = True147 __test__ = True
152148
@@ -187,10 +183,6 @@ class BionicTestMirrorboot(relbase.bionic, TestMirrorbootAbs):
187 __test__ = True183 __test__ = True
188184
189185
190class CosmicTestMirrorboot(relbase.cosmic, TestMirrorbootAbs):
191 __test__ = True
192
193
194class DiscoTestMirrorboot(relbase.disco, TestMirrorbootAbs):186class DiscoTestMirrorboot(relbase.disco, TestMirrorbootAbs):
195 __test__ = True187 __test__ = True
196188
@@ -234,11 +226,6 @@ class BionicTestMirrorbootPartitions(relbase.bionic,
234 __test__ = True226 __test__ = True
235227
236228
237class CosmicTestMirrorbootPartitions(relbase.cosmic,
238 TestMirrorbootPartitionsAbs):
239 __test__ = True
240
241
242class DiscoTestMirrorbootPartitions(relbase.disco,229class DiscoTestMirrorbootPartitions(relbase.disco,
243 TestMirrorbootPartitionsAbs):230 TestMirrorbootPartitionsAbs):
244 __test__ = True231 __test__ = True
@@ -289,11 +276,6 @@ class BionicTestMirrorbootPartitionsUEFI(relbase.bionic,
289 __test__ = True276 __test__ = True
290277
291278
292class CosmicTestMirrorbootPartitionsUEFI(relbase.cosmic,
293 TestMirrorbootPartitionsUEFIAbs):
294 __test__ = True
295
296
297class DiscoTestMirrorbootPartitionsUEFI(relbase.disco,279class DiscoTestMirrorbootPartitionsUEFI(relbase.disco,
298 TestMirrorbootPartitionsUEFIAbs):280 TestMirrorbootPartitionsUEFIAbs):
299 __test__ = True281 __test__ = True
@@ -336,10 +318,6 @@ class BionicTestRaid5boot(relbase.bionic, TestRaid5bootAbs):
336 __test__ = True318 __test__ = True
337319
338320
339class CosmicTestRaid5boot(relbase.cosmic, TestRaid5bootAbs):
340 __test__ = True
341
342
343class DiscoTestRaid5boot(relbase.disco, TestRaid5bootAbs):321class DiscoTestRaid5boot(relbase.disco, TestRaid5bootAbs):
344 __test__ = True322 __test__ = True
345323
@@ -396,10 +374,6 @@ class BionicTestRaid6boot(relbase.bionic, TestRaid6bootAbs):
396 __test__ = True374 __test__ = True
397375
398376
399class CosmicTestRaid6boot(relbase.cosmic, TestRaid6bootAbs):
400 __test__ = True
401
402
403class DiscoTestRaid6boot(relbase.disco, TestRaid6bootAbs):377class DiscoTestRaid6boot(relbase.disco, TestRaid6bootAbs):
404 __test__ = True378 __test__ = True
405379
@@ -442,10 +416,6 @@ class BionicTestRaid10boot(relbase.bionic, TestRaid10bootAbs):
442 __test__ = True416 __test__ = True
443417
444418
445class CosmicTestRaid10boot(relbase.cosmic, TestRaid10bootAbs):
446 __test__ = True
447
448
449class DiscoTestRaid10boot(relbase.disco, TestRaid10bootAbs):419class DiscoTestRaid10boot(relbase.disco, TestRaid10bootAbs):
450 __test__ = True420 __test__ = True
451421
@@ -546,10 +516,6 @@ class BionicTestAllindata(relbase.bionic, TestAllindataAbs):
546 __test__ = True516 __test__ = True
547517
548518
549class CosmicTestAllindata(relbase.cosmic, TestAllindataAbs):
550 __test__ = True
551
552
553class DiscoTestAllindata(relbase.disco, TestAllindataAbs):519class DiscoTestAllindata(relbase.disco, TestAllindataAbs):
554 __test__ = True520 __test__ = True
555521
diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
index fa8d88f..cd465c7 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -50,10 +50,6 @@ class BionicTestIscsiMdadm(relbase.bionic, TestMdadmIscsiAbs):
50 __test__ = True50 __test__ = True
5151
5252
53class CosmicTestIscsiMdadm(relbase.cosmic, TestMdadmIscsiAbs):
54 __test__ = True
55
56
57class DiscoTestIscsiMdadm(relbase.disco, TestMdadmIscsiAbs):53class DiscoTestIscsiMdadm(relbase.disco, TestMdadmIscsiAbs):
58 __test__ = True54 __test__ = True
5955
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index 8d25d57..e0b68ec 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -80,10 +80,6 @@ class BionicTestMultipathBasic(relbase.bionic, TestMultipathBasicAbs):
80 __test__ = True80 __test__ = True
8181
8282
83class CosmicTestMultipathBasic(relbase.cosmic, TestMultipathBasicAbs):
84 __test__ = True
85
86
87class DiscoTestMultipathBasic(relbase.disco, TestMultipathBasicAbs):83class DiscoTestMultipathBasic(relbase.disco, TestMultipathBasicAbs):
88 __test__ = True84 __test__ = True
8985
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index f28b2c9..6d3047c 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -472,10 +472,6 @@ class BionicTestNetworkBasic(relbase.bionic, TestNetworkBasicAbs):
472 __test__ = True472 __test__ = True
473473
474474
475class CosmicTestNetworkBasic(relbase.cosmic, TestNetworkBasicAbs):
476 __test__ = True
477
478
479class DiscoTestNetworkBasic(relbase.disco, TestNetworkBasicAbs):475class DiscoTestNetworkBasic(relbase.disco, TestNetworkBasicAbs):
480 __test__ = True476 __test__ = True
481477
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index fb4fb2c..995d982 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -52,10 +52,6 @@ class BionicTestNetworkAlias(relbase.bionic, TestNetworkAliasAbs):
52 __test__ = True52 __test__ = True
5353
5454
55class CosmicTestNetworkAlias(relbase.cosmic, TestNetworkAliasAbs):
56 __test__ = True
57
58
59class DiscoTestNetworkAlias(relbase.disco, TestNetworkAliasAbs):55class DiscoTestNetworkAlias(relbase.disco, TestNetworkAliasAbs):
60 __test__ = True56 __test__ = True
6157
diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
index a66591a..ec7b48c 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -57,10 +57,6 @@ class BionicTestBonding(relbase.bionic, TestNetworkBondingAbs):
57 __test__ = True57 __test__ = True
5858
5959
60class CosmicTestBonding(relbase.cosmic, TestNetworkBondingAbs):
61 __test__ = True
62
63
64class DiscoTestBonding(relbase.disco, TestNetworkBondingAbs):60class DiscoTestBonding(relbase.disco, TestNetworkBondingAbs):
65 __test__ = True61 __test__ = True
6662
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index b3ec287..c29bd33 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -236,10 +236,6 @@ class BionicTestBridging(relbase.bionic, TestBridgeNetworkAbs):
236 __test__ = True236 __test__ = True
237237
238238
239class CosmicTestBridging(relbase.cosmic, TestBridgeNetworkAbs):
240 __test__ = True
241
242
243class DiscoTestBridging(relbase.disco, TestBridgeNetworkAbs):239class DiscoTestBridging(relbase.disco, TestBridgeNetworkAbs):
244 __test__ = True240 __test__ = True
245241
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index 9b6acc9..e0a39a0 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -53,10 +53,6 @@ class BionicTestNetworkIPV6(relbase.bionic, TestNetworkIPV6Abs):
53 __test__ = True53 __test__ = True
5454
5555
56class CosmicTestNetworkIPV6(relbase.cosmic, TestNetworkIPV6Abs):
57 __test__ = True
58
59
60class DiscoTestNetworkIPV6(relbase.disco, TestNetworkIPV6Abs):56class DiscoTestNetworkIPV6(relbase.disco, TestNetworkIPV6Abs):
61 __test__ = True57 __test__ = True
6258
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index b79b9e4..925cc79 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -23,10 +23,6 @@ class BionicTestNetworkIPV6Static(relbase.bionic, TestNetworkIPV6StaticAbs):
23 __test__ = True23 __test__ = True
2424
2525
26class CosmicTestNetworkIPV6Static(relbase.cosmic, TestNetworkIPV6StaticAbs):
27 __test__ = True
28
29
30class DiscoTestNetworkIPV6Static(relbase.disco, TestNetworkIPV6StaticAbs):26class DiscoTestNetworkIPV6Static(relbase.disco, TestNetworkIPV6StaticAbs):
31 __test__ = True27 __test__ = True
3228
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 138ea6a..7ae5912 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -22,10 +22,6 @@ class BionicTestNetworkIPV6Vlan(relbase.bionic, TestNetworkIPV6VlanAbs):
22 __test__ = True22 __test__ = True
2323
2424
25class CosmicTestNetworkIPV6Vlan(relbase.cosmic, TestNetworkIPV6VlanAbs):
26 __test__ = True
27
28
29class DiscoTestNetworkIPV6Vlan(relbase.disco, TestNetworkIPV6VlanAbs):25class DiscoTestNetworkIPV6Vlan(relbase.disco, TestNetworkIPV6VlanAbs):
30 __test__ = True26 __test__ = True
3127
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index 30cc2c8..7b94c58 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -171,10 +171,6 @@ class BionicTestNetworkMtu(relbase.bionic, TestNetworkMtuAbs):
171171
172172
173@TestNetworkMtuAbs.skip_by_date("1671951", fixby="2019-10-02")173@TestNetworkMtuAbs.skip_by_date("1671951", fixby="2019-10-02")
174class CosmicTestNetworkMtu(relbase.cosmic, TestNetworkMtuAbs):
175 __test__ = True
176
177
178@TestNetworkMtuAbs.skip_by_date("1671951", fixby="2019-10-02")174@TestNetworkMtuAbs.skip_by_date("1671951", fixby="2019-10-02")
179class DiscoTestNetworkMtu(relbase.disco, TestNetworkMtuAbs):175class DiscoTestNetworkMtu(relbase.disco, TestNetworkMtuAbs):
180 __test__ = True176 __test__ = True
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index 9706a2d..01f30d5 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -28,10 +28,6 @@ class BionicTestNetworkStatic(relbase.bionic, TestNetworkStaticAbs):
28 __test__ = True28 __test__ = True
2929
3030
31class CosmicTestNetworkStatic(relbase.cosmic, TestNetworkStaticAbs):
32 __test__ = True
33
34
35class DiscoTestNetworkStatic(relbase.disco, TestNetworkStaticAbs):31class DiscoTestNetworkStatic(relbase.disco, TestNetworkStaticAbs):
36 __test__ = True32 __test__ = True
3733
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index b441bc9..5a8969c 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -28,11 +28,6 @@ class BionicTestNetworkStaticRoutes(relbase.bionic,
28 __test__ = True28 __test__ = True
2929
3030
31class CosmicTestNetworkStaticRoutes(relbase.cosmic,
32 TestNetworkStaticRoutesAbs):
33 __test__ = True
34
35
36class DiscoTestNetworkStaticRoutes(relbase.disco,31class DiscoTestNetworkStaticRoutes(relbase.disco,
37 TestNetworkStaticRoutesAbs):32 TestNetworkStaticRoutesAbs):
38 __test__ = True33 __test__ = True
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 88e3d35..843f11e 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -76,10 +76,6 @@ class BionicTestNetworkVlan(relbase.bionic, TestNetworkVlanAbs):
76 __test__ = True76 __test__ = True
7777
7878
79class CosmicTestNetworkVlan(relbase.cosmic, TestNetworkVlanAbs):
80 __test__ = True
81
82
83class DiscoTestNetworkVlan(relbase.disco, TestNetworkVlanAbs):79class DiscoTestNetworkVlan(relbase.disco, TestNetworkVlanAbs):
84 __test__ = True80 __test__ = True
8581
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index 730057e..bcd5c09 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -73,10 +73,6 @@ class BionicTestNvme(relbase.bionic, TestNvmeAbs):
73 __test__ = True73 __test__ = True
7474
7575
76class CosmicTestNvme(relbase.cosmic, TestNvmeAbs):
77 __test__ = True
78
79
80class DiscoTestNvme(relbase.disco, TestNvmeAbs):76class DiscoTestNvme(relbase.disco, TestNvmeAbs):
81 __test__ = True77 __test__ = True
8278
@@ -147,10 +143,6 @@ class BionicTestNvmeBcache(relbase.bionic, TestNvmeBcacheAbs):
147 __test__ = True143 __test__ = True
148144
149145
150class CosmicTestNvmeBcache(relbase.cosmic, TestNvmeBcacheAbs):
151 __test__ = True
152
153
154class DiscoTestNvmeBcache(relbase.disco, TestNvmeBcacheAbs):146class DiscoTestNvmeBcache(relbase.disco, TestNvmeBcacheAbs):
155 __test__ = True147 __test__ = True
156148
diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
index d9d9d9d..f01add2 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -61,10 +61,6 @@ class BionicTestPollinateUserAgent(relbase.bionic, TestPollinateUserAgent):
61 __test__ = True61 __test__ = True
6262
6363
64class CosmicTestPollinateUserAgent(relbase.cosmic, TestPollinateUserAgent):
65 __test__ = True
66
67
68class DiscoTestPollinateUserAgent(relbase.disco, TestPollinateUserAgent):64class DiscoTestPollinateUserAgent(relbase.disco, TestPollinateUserAgent):
69 __test__ = True65 __test__ = True
7066
diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
index 2387aa4..434b71d 100644
--- a/tests/vmtests/test_preserve.py
+++ b/tests/vmtests/test_preserve.py
@@ -25,10 +25,6 @@ class BionicTestPreserve(relbase.bionic, TestPreserve):
25 __test__ = True25 __test__ = True
2626
2727
28class CosmicTestPreserve(relbase.cosmic, TestPreserve):
29 __test__ = True
30
31
32class DiscoTestPreserve(relbase.disco, TestPreserve):28class DiscoTestPreserve(relbase.disco, TestPreserve):
33 __test__ = True29 __test__ = True
3430
diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
index cf2b808..678f893 100644
--- a/tests/vmtests/test_preserve_raid.py
+++ b/tests/vmtests/test_preserve_raid.py
@@ -25,10 +25,6 @@ class BionicTestPreserveRAID(relbase.bionic, TestPreserveRAID):
25 __test__ = True25 __test__ = True
2626
2727
28class CosmicTestPreserveRAID(relbase.cosmic, TestPreserveRAID):
29 __test__ = True
30
31
32class DiscoTestPreserveRAID(relbase.disco, TestPreserveRAID):28class DiscoTestPreserveRAID(relbase.disco, TestPreserveRAID):
33 __test__ = True29 __test__ = True
3430
diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
index 67a794d..90549b2 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -83,10 +83,6 @@ class BionicTestRaid5Bcache(relbase.bionic, TestMdadmBcacheAbs):
83 __test__ = True83 __test__ = True
8484
8585
86class CosmicTestRaid5Bcache(relbase.cosmic, TestMdadmBcacheAbs):
87 __test__ = True
88
89
90class DiscoTestRaid5Bcache(relbase.disco, TestMdadmBcacheAbs):86class DiscoTestRaid5Bcache(relbase.disco, TestMdadmBcacheAbs):
91 __test__ = True87 __test__ = True
9288
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index b529c88..8c46af7 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -49,13 +49,6 @@ class BionicTestSimple(relbase.bionic, TestSimple):
49 self.output_files_exist(["netplan.yaml"])49 self.output_files_exist(["netplan.yaml"])
5050
5151
52class CosmicTestSimple(relbase.cosmic, TestSimple):
53 __test__ = True
54
55 def test_output_files_exist(self):
56 self.output_files_exist(["netplan.yaml"])
57
58
59class DiscoTestSimple(relbase.disco, TestSimple):52class DiscoTestSimple(relbase.disco, TestSimple):
60 __test__ = True53 __test__ = True
6154
@@ -112,13 +105,6 @@ class BionicTestSimpleStorage(relbase.bionic, TestSimpleStorage):
112 self.output_files_exist(["netplan.yaml"])105 self.output_files_exist(["netplan.yaml"])
113106
114107
115class CosmicTestSimpleStorage(relbase.cosmic, TestSimpleStorage):
116 __test__ = True
117
118 def test_output_files_exist(self):
119 self.output_files_exist(["netplan.yaml"])
120
121
122class DiscoTestSimpleStorage(relbase.disco, TestSimpleStorage):108class DiscoTestSimpleStorage(relbase.disco, TestSimpleStorage):
123 __test__ = True109 __test__ = True
124110
diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
index 51696c2..d28d12d 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -105,10 +105,6 @@ class BionicUefiTestBasic(relbase.bionic, TestBasicAbs):
105 __test__ = True105 __test__ = True
106106
107107
108class CosmicUefiTestBasic(relbase.cosmic, TestBasicAbs):
109 __test__ = True
110
111
112class DiscoUefiTestBasic(relbase.disco, TestBasicAbs):108class DiscoUefiTestBasic(relbase.disco, TestBasicAbs):
113 __test__ = True109 __test__ = True
114110
@@ -132,11 +128,6 @@ class BionicUefiTestBasic4k(relbase.bionic, TestBasicAbs):
132 disk_block_size = 4096128 disk_block_size = 4096
133129
134130
135class CosmicUefiTestBasic4k(relbase.cosmic, TestBasicAbs):
136 __test__ = True
137 disk_block_size = 4096
138
139
140class DiscoUefiTestBasic4k(relbase.disco, TestBasicAbs):131class DiscoUefiTestBasic4k(relbase.disco, TestBasicAbs):
141 __test__ = True132 __test__ = True
142 disk_block_size = 4096133 disk_block_size = 4096
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index ac35a4e..8956f50 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -93,10 +93,6 @@ class BionicTestZfsRoot(relbase.bionic, TestZfsRootAbs):
93 __test__ = True93 __test__ = True
9494
9595
96class CosmicTestZfsRoot(relbase.cosmic, TestZfsRootAbs):
97 __test__ = True
98
99
100class DiscoTestZfsRoot(relbase.disco, TestZfsRootAbs):96class DiscoTestZfsRoot(relbase.disco, TestZfsRootAbs):
101 __test__ = True97 __test__ = True
10298
@@ -123,10 +119,6 @@ class BionicTestZfsRootFsType(relbase.bionic, TestZfsRootFsTypeAbs):
123 __test__ = True119 __test__ = True
124120
125121
126class CosmicTestZfsRootFsType(relbase.cosmic, TestZfsRootFsTypeAbs):
127 __test__ = True
128
129
130class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):122class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):
131 __test__ = True123 __test__ = True
132124

Subscribers

People subscribed via source and target branches