curtin

Merge ~dbungert/curtin:cloud-init-vmtest-ctd into curtin:master

  1. Git
  2. lp:~dbungert/curtin
  3. cloud-init-vmtest-ctd
  4. Merge into master
Proposed by Dan Bungert
Status: Merged
Approved by: Dan Bungert
Approved revision: 1bec49fd274285e6507535a77968fc188917e909
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~dbungert/curtin:cloud-init-vmtest-ctd
Merge into: curtin:master
Diff against target: 949 lines (+0/-328)
50 files modified
tests/vmtests/releases.py (+0/-8)
tests/vmtests/test_apt_config_cmd.py (+0/-4)
tests/vmtests/test_basic.py (+0/-8)
tests/vmtests/test_basic_dasd.py (+0/-4)
tests/vmtests/test_bcache_basic.py (+0/-4)
tests/vmtests/test_bcache_bug1718699.py (+0/-4)
tests/vmtests/test_bcache_ceph.py (+0/-8)
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_lvm_root.py (+0/-15)
tests/vmtests/test_mdadm_bcache.py (+0/-34)
tests/vmtests/test_mdadm_iscsi.py (+0/-4)
tests/vmtests/test_multipath.py (+0/-8)
tests/vmtests/test_multipath_lvm.py (+0/-9)
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_disabled.py (+0/-14)
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_ovs.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/-10)
tests/vmtests/test_panic.py (+0/-4)
tests/vmtests/test_pollinate_useragent.py (+0/-4)
tests/vmtests/test_preserve.py (+0/-4)
tests/vmtests/test_preserve_bcache.py (+0/-4)
tests/vmtests/test_preserve_lvm.py (+0/-4)
tests/vmtests/test_preserve_partition_wipe_vg.py (+0/-10)
tests/vmtests/test_preserve_raid.py (+0/-9)
tests/vmtests/test_python_apt.py (+0/-4)
tests/vmtests/test_raid5_bcache.py (+0/-4)
tests/vmtests/test_raid_partition_to_disk.py (+0/-4)
tests/vmtests/test_reuse_lvm_member.py (+0/-5)
tests/vmtests/test_reuse_msdos_partitions.py (+0/-5)
tests/vmtests/test_reuse_raid_member.py (+0/-9)
tests/vmtests/test_reuse_uefi_esp.py (+0/-7)
tests/vmtests/test_simple.py (+0/-21)
tests/vmtests/test_uefi_basic.py (+0/-9)
tests/vmtests/test_zfsroot.py (+0/-10)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chris Peterson Approve
Review via email: mp+452185@code.launchpad.net

Commit message

Revert "vmtests: add mantic after jammy"

This reverts commit abebab1e1e30a16d4be891a051060e81254ff0c5.

Description of the change

The motivation right now around vmtests is unblocking cloud-init SRU
testing. Mantic testing is not on their test path, for several
reasons, mostly with the fact that this testing is focused on
network cases which are not valid for Ubuntu Mantic.

Also, the underlying images aren't available anyhow on the image
stream, so these tests can't even run yet unless environment
variable MAAS_IMAGE_STREAM=candidate is set.

These mantic network tests fail if we force them to run in spite of
the above.

Disable for now and let's revisit.

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

PASSED: Continuous integration, rev:1bec49fd274285e6507535a77968fc188917e909
https://jenkins.canonical.com/server-team/job/curtin-ci/204/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/204/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/204/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/204/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/204/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/204//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/releases.py b/tests/vmtests/releases.py
2index 7519c57..56e5e8c 100644
3--- a/tests/vmtests/releases.py
4+++ b/tests/vmtests/releases.py
5@@ -172,13 +172,6 @@ class _JammyBase(_UbuntuBase):
6 subarch = "ga-22.04"
7
8
9-class _ManticBase(_UbuntuBase):
10- release = "mantic"
11- target_release = "mantic"
12- if _UbuntuBase.arch == "arm64":
13- subarch = "ga-23.10"
14-
15-
16 class _Releases(object):
17 trusty = _TrustyBase
18 precise = _PreciseBase
19@@ -198,7 +191,6 @@ class _Releases(object):
20 eoan = _EoanBase
21 focal = _FocalBase
22 jammy = _JammyBase
23- mantic = _ManticBase
24
25
26 class _CentosReleases(object):
27diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
28index 50ea224..a847910 100644
29--- a/tests/vmtests/test_apt_config_cmd.py
30+++ b/tests/vmtests/test_apt_config_cmd.py
31@@ -72,8 +72,4 @@ class JammyTestAptConfigCMDCMD(relbase.jammy, TestAptConfigCMD):
32 __test__ = True
33
34
35-class ManticTestAptConfigCMDCMD(relbase.mantic, TestAptConfigCMD):
36- __test__ = True
37-
38-
39 # vi: ts=4 expandtab syntax=python
40diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
41index 1a99395..f626f2e 100644
42--- a/tests/vmtests/test_basic.py
43+++ b/tests/vmtests/test_basic.py
44@@ -238,10 +238,6 @@ class JammyTestBasic(relbase.jammy, TestBasicAbs):
45 __test__ = True
46
47
48-class ManticTestBasic(relbase.mantic, TestBasicAbs):
49- __test__ = True
50-
51-
52 class TestBasicScsiAbs(TestBasicAbs):
53 arch_skip = [
54 'arm64', # arm64 is UEFI only
55@@ -362,8 +358,4 @@ class JammyTestScsiBasic(relbase.jammy, TestBasicScsiAbs):
56 __test__ = True
57
58
59-class ManticTestScsiBasic(relbase.mantic, TestBasicScsiAbs):
60- __test__ = True
61-
62-
63 # vi: ts=4 expandtab syntax=python
64diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
65index 3ab7544..154f26d 100644
66--- a/tests/vmtests/test_basic_dasd.py
67+++ b/tests/vmtests/test_basic_dasd.py
68@@ -60,8 +60,4 @@ class JammyTestBasicDasd(relbase.jammy, TestBasicDasd):
69 __test__ = True
70
71
72-class ManticTestBasicDasd(relbase.mantic, TestBasicDasd):
73- __test__ = True
74-
75-
76 # vi: ts=4 expandtab syntax=python
77diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
78index f4d8731..2e62f0b 100644
79--- a/tests/vmtests/test_bcache_basic.py
80+++ b/tests/vmtests/test_bcache_basic.py
81@@ -72,8 +72,4 @@ class JammyBcacheBasic(relbase.jammy, TestBcacheBasic):
82 __test__ = True
83
84
85-class ManticBcacheBasic(relbase.mantic, TestBcacheBasic):
86- __test__ = True
87-
88-
89 # vi: ts=4 expandtab syntax=python
90diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
91index 6eb781c..82a765a 100644
92--- a/tests/vmtests/test_bcache_bug1718699.py
93+++ b/tests/vmtests/test_bcache_bug1718699.py
94@@ -27,8 +27,4 @@ class JammyTestBcacheBug1718699(relbase.jammy, TestBcacheBug1718699):
95 __test__ = True
96
97
98-class ManticTestBcacheBug1718699(relbase.mantic, TestBcacheBug1718699):
99- __test__ = True
100-
101-
102 # vi: ts=4 expandtab syntax=python
103diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
104index 9bc7287..15cce59 100644
105--- a/tests/vmtests/test_bcache_ceph.py
106+++ b/tests/vmtests/test_bcache_ceph.py
107@@ -83,10 +83,6 @@ class JammyTestBcacheCeph(relbase.jammy, TestBcacheCeph):
108 __test__ = True
109
110
111-class ManticTestBcacheCeph(relbase.mantic, TestBcacheCeph):
112- __test__ = True
113-
114-
115 class TestBcacheCephLvm(TestBcacheCeph):
116 test_type = 'storage'
117 nr_cpus = 2
118@@ -117,8 +113,4 @@ class JammyTestBcacheCephLvm(relbase.jammy, TestBcacheCephLvm):
119 __test__ = True
120
121
122-class ManticTestBcacheCephLvm(relbase.mantic, TestBcacheCephLvm):
123- __test__ = True
124-
125-
126 # vi: ts=4 expandtab syntax=python
127diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
128index 52cfd03..c3c41bc 100644
129--- a/tests/vmtests/test_bcache_partitions.py
130+++ b/tests/vmtests/test_bcache_partitions.py
131@@ -33,8 +33,4 @@ class JammyTestBcachePartitions(relbase.jammy, TestBcachePartitions):
132 __test__ = True
133
134
135-class ManticTestBcachePartitions(relbase.mantic, TestBcachePartitions):
136- __test__ = True
137-
138-
139 # vi: ts=4 expandtab syntax=python
140diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
141index 034f10f..75084b0 100644
142--- a/tests/vmtests/test_fs_battery.py
143+++ b/tests/vmtests/test_fs_battery.py
144@@ -247,8 +247,4 @@ class JammyTestFsBattery(relbase.jammy, TestFsBattery):
145 __test__ = True
146
147
148-class ManticTestFsBattery(relbase.mantic, TestFsBattery):
149- __test__ = True
150-
151-
152 # vi: ts=4 expandtab syntax=python
153diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
154index 05c28fc..6ad343d 100644
155--- a/tests/vmtests/test_iscsi.py
156+++ b/tests/vmtests/test_iscsi.py
157@@ -80,8 +80,4 @@ class JammyTestIscsiBasic(relbase.jammy, TestBasicIscsiAbs):
158 __test__ = True
159
160
161-class ManticTestIscsiBasic(relbase.mantic, TestBasicIscsiAbs):
162- __test__ = True
163-
164-
165 # vi: ts=4 expandtab syntax=python
166diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
167index 299fef7..ba39af2 100644
168--- a/tests/vmtests/test_journald_reporter.py
169+++ b/tests/vmtests/test_journald_reporter.py
170@@ -40,8 +40,4 @@ class JammyTestJournaldReporter(relbase.jammy, TestJournaldReporter):
171 __test__ = True
172
173
174-class ManticTestJournaldReporter(relbase.mantic, TestJournaldReporter):
175- __test__ = True
176-
177-
178 # vi: ts=4 expandtab syntax=python
179diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
180index 052d339..e15838e 100644
181--- a/tests/vmtests/test_lvm.py
182+++ b/tests/vmtests/test_lvm.py
183@@ -85,8 +85,4 @@ class JammyTestLvm(relbase.jammy, TestLvmAbs):
184 __test__ = True
185
186
187-class ManticTestLvm(relbase.mantic, TestLvmAbs):
188- __test__ = True
189-
190-
191 # vi: ts=4 expandtab syntax=python
192diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
193index 76117c1..94e523b 100644
194--- a/tests/vmtests/test_lvm_iscsi.py
195+++ b/tests/vmtests/test_lvm_iscsi.py
196@@ -103,8 +103,4 @@ class JammyTestIscsiLvm(relbase.jammy, TestLvmIscsiAbs):
197 __test__ = True
198
199
200-class ManticTestIscsiLvm(relbase.mantic, TestLvmIscsiAbs):
201- __test__ = True
202-
203-
204 # vi: ts=4 expandtab syntax=python
205diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
206index d9eb9ff..b265318 100644
207--- a/tests/vmtests/test_lvm_raid.py
208+++ b/tests/vmtests/test_lvm_raid.py
209@@ -63,8 +63,4 @@ class JammyTestLvmOverRaid(relbase.jammy, TestLvmOverRaidAbs):
210 __test__ = True
211
212
213-class ManticTestLvmOverRaid(relbase.mantic, TestLvmOverRaidAbs):
214- __test__ = True
215-
216-
217 # vi: ts=4 expandtab syntax=python
218diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
219index 3d14a2b..6464f22 100644
220--- a/tests/vmtests/test_lvm_root.py
221+++ b/tests/vmtests/test_lvm_root.py
222@@ -101,13 +101,6 @@ class JammyTestLvmRootExt4(relbase.jammy, TestLvmRootAbs):
223 }
224
225
226-class ManticTestLvmRootExt4(relbase.mantic, TestLvmRootAbs):
227- __test__ = True
228- conf_replace = {
229- '__ROOTFS_FORMAT__': 'ext4',
230- }
231-
232-
233 class XenialTestLvmRootXfs(relbase.xenial, TestLvmRootAbs):
234 __test__ = True
235 conf_replace = {
236@@ -162,14 +155,6 @@ class JammyTestUefiLvmRootExt4(relbase.jammy, TestUefiLvmRootAbs):
237 }
238
239
240-class ManticTestUefiLvmRootExt4(relbase.mantic, TestUefiLvmRootAbs):
241- __test__ = True
242- conf_replace = {
243- '__BOOTFS_FORMAT__': 'ext4',
244- '__ROOTFS_FORMAT__': 'ext4',
245- }
246-
247-
248 class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs):
249 __test__ = True
250 conf_replace = {
251diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
252index 95c2d58..54b3588 100644
253--- a/tests/vmtests/test_mdadm_bcache.py
254+++ b/tests/vmtests/test_mdadm_bcache.py
255@@ -162,10 +162,6 @@ class JammyTestMdadmBcache(relbase.jammy, TestMdadmBcacheAbs):
256 __test__ = True
257
258
259-class ManticTestMdadmBcache(relbase.mantic, TestMdadmBcacheAbs):
260- __test__ = True
261-
262-
263 class TestMirrorbootAbs(TestMdadmAbs):
264 # alternative config for more complex setup
265 conf_file = "examples/tests/mirrorboot.yaml"
266@@ -211,10 +207,6 @@ class JammyTestMirrorboot(relbase.jammy, TestMirrorbootAbs):
267 __test__ = True
268
269
270-class ManticTestMirrorboot(relbase.mantic, TestMirrorbootAbs):
271- __test__ = True
272-
273-
274 class TestMirrorbootPartitionsAbs(TestMdadmAbs):
275 # alternative config for more complex setup
276 conf_file = "examples/tests/mirrorboot-msdos-partition.yaml"
277@@ -265,11 +257,6 @@ class JammyTestMirrorbootPartitions(relbase.jammy,
278 __test__ = True
279
280
281-class ManticTestMirrorbootPartitions(relbase.mantic,
282- TestMirrorbootPartitionsAbs):
283- __test__ = True
284-
285-
286 class TestMirrorbootPartitionsUEFIAbs(TestMdadmAbs):
287 # alternative config for more complex setup
288 conf_file = "examples/tests/mirrorboot-uefi.yaml"
289@@ -365,11 +352,6 @@ class JammyTestMirrorbootPartitionsUEFI(relbase.jammy,
290 __test__ = True
291
292
293-class ManticTestMirrorbootPartitionsUEFI(relbase.mantic,
294- TestMirrorbootPartitionsUEFIAbs):
295- __test__ = True
296-
297-
298 class TestRaid5bootAbs(TestMdadmAbs):
299 # alternative config for more complex setup
300 conf_file = "examples/tests/raid5boot.yaml"
301@@ -418,10 +400,6 @@ class JammyTestRaid5boot(relbase.jammy, TestRaid5bootAbs):
302 __test__ = True
303
304
305-class ManticTestRaid5boot(relbase.mantic, TestRaid5bootAbs):
306- __test__ = True
307-
308-
309 class TestRaid6bootAbs(TestMdadmAbs):
310 # alternative config for more complex setup
311 conf_file = "examples/tests/raid6boot.yaml"
312@@ -483,10 +461,6 @@ class JammyTestRaid6boot(relbase.jammy, TestRaid6bootAbs):
313 __test__ = True
314
315
316-class ManticTestRaid6boot(relbase.mantic, TestRaid6bootAbs):
317- __test__ = True
318-
319-
320 class TestRaid10bootAbs(TestMdadmAbs):
321 # alternative config for more complex setup
322 conf_file = "examples/tests/raid10boot.yaml"
323@@ -534,10 +508,6 @@ class JammyTestRaid10boot(relbase.jammy, TestRaid10bootAbs):
324 __test__ = True
325
326
327-class ManticTestRaid10boot(relbase.mantic, TestRaid10bootAbs):
328- __test__ = True
329-
330-
331 class TestAllindataAbs(TestMdadmAbs):
332 # more complex, needs more time
333 # alternative config for more complex setup
334@@ -642,8 +612,4 @@ class JammyTestAllindata(relbase.jammy, TestAllindataAbs):
335 __test__ = True
336
337
338-class ManticTestAllindata(relbase.mantic, TestAllindataAbs):
339- __test__ = True
340-
341-
342 # vi: ts=4 expandtab syntax=python
343diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
344index 7280082..128712c 100644
345--- a/tests/vmtests/test_mdadm_iscsi.py
346+++ b/tests/vmtests/test_mdadm_iscsi.py
347@@ -58,8 +58,4 @@ class JammyTestIscsiMdadm(relbase.jammy, TestMdadmIscsiAbs):
348 __test__ = True
349
350
351-class ManticTestIscsiMdadm(relbase.mantic, TestMdadmIscsiAbs):
352- __test__ = True
353-
354-
355 # vi: ts=4 expandtab syntax=python
356diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
357index 28b5acd..0067737 100644
358--- a/tests/vmtests/test_multipath.py
359+++ b/tests/vmtests/test_multipath.py
360@@ -166,10 +166,6 @@ class JammyTestMultipathBasic(relbase.jammy, TestMultipathBasicAbs):
361 __test__ = True
362
363
364-class ManticTestMultipathBasic(relbase.mantic, TestMultipathBasicAbs):
365- __test__ = True
366-
367-
368 class TestMultipathReuseAbs(TestMultipathBasicAbs):
369 conf_file = "examples/tests/multipath-reuse.yaml"
370
371@@ -182,8 +178,4 @@ class JammyTestMultipathReuse(relbase.jammy, TestMultipathReuseAbs):
372 __test__ = True
373
374
375-class ManticTestMultipathReuse(relbase.mantic, TestMultipathReuseAbs):
376- __test__ = True
377-
378-
379 # vi: ts=4 expandtab syntax=python
380diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py
381index 1d60be7..aaeefd5 100644
382--- a/tests/vmtests/test_multipath_lvm.py
383+++ b/tests/vmtests/test_multipath_lvm.py
384@@ -64,10 +64,6 @@ class JammyTestMultipathLvm(relbase.jammy, TestMultipathLvmAbs):
385 __test__ = True
386
387
388-class ManticTestMultipathLvm(relbase.mantic, TestMultipathLvmAbs):
389- __test__ = True
390-
391-
392 class TestMultipathLvmPartWipeAbs(TestMultipathLvmAbs):
393 conf_file = "examples/tests/multipath-lvm-part-wipe.yaml"
394
395@@ -82,9 +78,4 @@ class JammyTestMultipathLvmPartWipe(relbase.jammy,
396 __test__ = True
397
398
399-class ManticTestMultipathLvmPartWipe(relbase.mantic,
400- TestMultipathLvmPartWipeAbs):
401- __test__ = True
402-
403-
404 # vi: ts=4 expandtab syntax=python
405diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
406index e838934..4b16aeb 100644
407--- a/tests/vmtests/test_network.py
408+++ b/tests/vmtests/test_network.py
409@@ -482,10 +482,6 @@ class JammyTestNetworkBasic(relbase.jammy, TestNetworkBasicAbs):
410 __test__ = True
411
412
413-class ManticTestNetworkBasic(relbase.mantic, TestNetworkBasicAbs):
414- __test__ = True
415-
416-
417 class Centos70TestNetworkBasic(centos_relbase.centos70_xenial,
418 CentosTestNetworkBasicAbs):
419 __test__ = True
420diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
421index 1570c8f..628a8b7 100644
422--- a/tests/vmtests/test_network_alias.py
423+++ b/tests/vmtests/test_network_alias.py
424@@ -55,8 +55,4 @@ class JammyTestNetworkAlias(relbase.jammy, TestNetworkAliasAbs):
425 __test__ = True
426
427
428-class ManticTestNetworkAlias(relbase.mantic, TestNetworkAliasAbs):
429- __test__ = True
430-
431-
432 # vi: ts=4 expandtab syntax=python
433diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
434index fb91179..ea411d8 100644
435--- a/tests/vmtests/test_network_bonding.py
436+++ b/tests/vmtests/test_network_bonding.py
437@@ -65,10 +65,6 @@ class JammyTestBonding(relbase.jammy, TestNetworkBondingAbs):
438 __test__ = True
439
440
441-class ManticTestBonding(relbase.mantic, TestNetworkBondingAbs):
442- __test__ = True
443-
444-
445 class Centos70TestNetworkBonding(centos_relbase.centos70_xenial,
446 CentosTestNetworkBondingAbs):
447 __test__ = True
448diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
449index a46841f..c8c52b3 100644
450--- a/tests/vmtests/test_network_bridging.py
451+++ b/tests/vmtests/test_network_bridging.py
452@@ -237,10 +237,6 @@ class JammyTestBridging(relbase.jammy, TestBridgeNetworkAbs):
453 __test__ = True
454
455
456-class ManticTestBridging(relbase.mantic, TestBridgeNetworkAbs):
457- __test__ = True
458-
459-
460 class XenialTestBridgingV2(relbase.xenial, TestBridgeNetworkAbs):
461 """ This class only needs to verify that when provided a v2 config
462 that the Xenial network packages are installed. """
463diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py
464index 3494d38..b4f9eb7 100644
465--- a/tests/vmtests/test_network_disabled.py
466+++ b/tests/vmtests/test_network_disabled.py
467@@ -83,18 +83,4 @@ class JammyCurtinDisableCloudInitNetworkingVersion1(relbase.jammy, TestKlass3):
468 __test__ = True
469
470
471-class ManticCurtinDisableNetworkRendering(relbase.mantic, TestKlass1):
472- __test__ = True
473-
474-
475-class ManticCurtinDisableCloudInitNetworking(relbase.mantic, TestKlass2):
476- __test__ = True
477-
478-
479-class ManticCurtinDisableCloudInitNetworkingVersion1(
480- relbase.mantic, TestKlass3
481-):
482- __test__ = True
483-
484-
485 # vi: ts=4 expandtab syntax=python
486diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
487index 5b96b16..5c31b48 100644
488--- a/tests/vmtests/test_network_ipv6.py
489+++ b/tests/vmtests/test_network_ipv6.py
490@@ -61,10 +61,6 @@ class JammyTestNetworkIPV6(relbase.jammy, TestNetworkIPV6Abs):
491 __test__ = True
492
493
494-class ManticTestNetworkIPV6(relbase.mantic, TestNetworkIPV6Abs):
495- __test__ = True
496-
497-
498 class Centos70TestNetworkIPV6(centos_relbase.centos70_xenial,
499 CentosTestNetworkIPV6Abs):
500 __test__ = True
501diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
502index 8e070e8..5352bfe 100644
503--- a/tests/vmtests/test_network_ipv6_static.py
504+++ b/tests/vmtests/test_network_ipv6_static.py
505@@ -31,10 +31,6 @@ class JammyTestNetworkIPV6Static(relbase.jammy, TestNetworkIPV6StaticAbs):
506 __test__ = True
507
508
509-class ManticTestNetworkIPV6Static(relbase.mantic, TestNetworkIPV6StaticAbs):
510- __test__ = True
511-
512-
513 class Centos70TestNetworkIPV6Static(centos_relbase.centos70_xenial,
514 CentosTestNetworkIPV6StaticAbs):
515 __test__ = True
516diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
517index 0e7e302..8f3fe64 100644
518--- a/tests/vmtests/test_network_ipv6_vlan.py
519+++ b/tests/vmtests/test_network_ipv6_vlan.py
520@@ -30,10 +30,6 @@ class JammyTestNetworkIPV6Vlan(relbase.jammy, TestNetworkIPV6VlanAbs):
521 __test__ = True
522
523
524-class ManticTestNetworkIPV6Vlan(relbase.mantic, TestNetworkIPV6VlanAbs):
525- __test__ = True
526-
527-
528 class Centos70TestNetworkIPV6Vlan(centos_relbase.centos70_xenial,
529 CentosTestNetworkIPV6VlanAbs):
530 __test__ = True
531diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
532index 7aff7b2..67d5d01 100644
533--- a/tests/vmtests/test_network_mtu.py
534+++ b/tests/vmtests/test_network_mtu.py
535@@ -197,10 +197,6 @@ class JammyTestNetworkMtu(relbase.jammy, TestNetworkMtuNetworkdAbs):
536 __test__ = True
537
538
539-class ManticTestNetworkMtu(relbase.mantic, TestNetworkMtuNetworkdAbs):
540- __test__ = True
541-
542-
543 class Centos70TestNetworkMtu(centos_relbase.centos70_xenial,
544 CentosTestNetworkMtuAbs):
545 __test__ = True
546diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py
547index d6e23c8..e168a0d 100644
548--- a/tests/vmtests/test_network_ovs.py
549+++ b/tests/vmtests/test_network_ovs.py
550@@ -42,8 +42,4 @@ class JammyTestNetworkOvs(relbase.jammy, TestNetworkOvsAbs):
551 __test__ = True
552
553
554-class ManticTestNetworkOvs(relbase.mantic, TestNetworkOvsAbs):
555- __test__ = True
556-
557-
558 # vi: ts=4 expandtab syntax=python
559diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
560index 9a2adb3..620c952 100644
561--- a/tests/vmtests/test_network_static.py
562+++ b/tests/vmtests/test_network_static.py
563@@ -36,10 +36,6 @@ class JammyTestNetworkStatic(relbase.jammy, TestNetworkStaticAbs):
564 __test__ = True
565
566
567-class ManticTestNetworkStatic(relbase.mantic, TestNetworkStaticAbs):
568- __test__ = True
569-
570-
571 class Centos70TestNetworkStatic(centos_relbase.centos70_xenial,
572 CentosTestNetworkStaticAbs):
573 __test__ = True
574diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
575index 8ddeeaf..0258113 100644
576--- a/tests/vmtests/test_network_static_routes.py
577+++ b/tests/vmtests/test_network_static_routes.py
578@@ -38,11 +38,6 @@ class JammyTestNetworkStaticRoutes(relbase.jammy,
579 __test__ = True
580
581
582-class ManticTestNetworkStaticRoutes(relbase.mantic,
583- TestNetworkStaticRoutesAbs):
584- __test__ = True
585-
586-
587 class Centos70TestNetworkStaticRoutes(centos_relbase.centos70_xenial,
588 CentosTestNetworkStaticRoutesAbs):
589 __test__ = False
590diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
591index 6fca423..0ab62bb 100644
592--- a/tests/vmtests/test_network_vlan.py
593+++ b/tests/vmtests/test_network_vlan.py
594@@ -84,10 +84,6 @@ class JammyTestNetworkVlan(relbase.jammy, TestNetworkVlanAbs):
595 __test__ = True
596
597
598-class ManticTestNetworkVlan(relbase.mantic, TestNetworkVlanAbs):
599- __test__ = True
600-
601-
602 class Centos70TestNetworkVlan(centos_relbase.centos70_xenial,
603 CentosTestNetworkVlanAbs):
604 __test__ = True
605diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
606index d458fca..dd071e9 100644
607--- a/tests/vmtests/test_nvme.py
608+++ b/tests/vmtests/test_nvme.py
609@@ -85,12 +85,6 @@ class JammyTestNvme(relbase.jammy, TestNvmeAbs):
610 # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
611
612
613-class ManticTestNvme(relbase.mantic, TestNvmeAbs):
614- __test__ = False
615- # An error occured handling 'nvme_disk2':
616- # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
617-
618-
619 class TestNvmeBcacheAbs(TestNvmeAbs):
620 arch_skip = [
621 "s390x", # nvme is a pci device, no pci on s390x
622@@ -161,8 +155,4 @@ class JammyTestNvmeBcache(relbase.jammy, TestNvmeBcacheAbs):
623 __test__ = True
624
625
626-class ManticTestNvmeBcache(relbase.mantic, TestNvmeBcacheAbs):
627- __test__ = True
628-
629-
630 # vi: ts=4 expandtab syntax=python
631diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py
632index d3861e3..d8d3f22 100644
633--- a/tests/vmtests/test_panic.py
634+++ b/tests/vmtests/test_panic.py
635@@ -33,8 +33,4 @@ class JammyTestInstallPanic(relbase.jammy, TestInstallPanic):
636 __test__ = True
637
638
639-class ManticTestInstallPanic(relbase.mantic, TestInstallPanic):
640- __test__ = True
641-
642-
643 # vi: ts=4 expandtab syntax=python
644diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
645index 3215142..5a4b0fb 100644
646--- a/tests/vmtests/test_pollinate_useragent.py
647+++ b/tests/vmtests/test_pollinate_useragent.py
648@@ -69,8 +69,4 @@ class JammyTestPollinateUserAgent(relbase.jammy, TestPollinateUserAgent):
649 __test__ = True
650
651
652-class ManticTestPollinateUserAgent(relbase.mantic, TestPollinateUserAgent):
653- __test__ = True
654-
655-
656 # vi: ts=4 expandtab syntax=python
657diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
658index 4fbf832..d6eb922 100644
659--- a/tests/vmtests/test_preserve.py
660+++ b/tests/vmtests/test_preserve.py
661@@ -33,8 +33,4 @@ class JammyTestPreserve(relbase.jammy, TestPreserve):
662 __test__ = True
663
664
665-class ManticTestPreserve(relbase.mantic, TestPreserve):
666- __test__ = True
667-
668-
669 # vi: ts=4 expandtab syntax=python
670diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py
671index 23e4dee..2384be8 100644
672--- a/tests/vmtests/test_preserve_bcache.py
673+++ b/tests/vmtests/test_preserve_bcache.py
674@@ -64,8 +64,4 @@ class JammyTestPreserveBcache(relbase.jammy, TestPreserveBcache):
675 __test__ = True
676
677
678-class ManticTestPreserveBcache(relbase.mantic, TestPreserveBcache):
679- __test__ = True
680-
681-
682 # vi: ts=4 expandtab syntax=python
683diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py
684index 4b5401d..1eb954e 100644
685--- a/tests/vmtests/test_preserve_lvm.py
686+++ b/tests/vmtests/test_preserve_lvm.py
687@@ -77,8 +77,4 @@ class JammyTestLvmPreserve(relbase.jammy, TestLvmPreserveAbs):
688 __test__ = True
689
690
691-class ManticTestLvmPreserve(relbase.mantic, TestLvmPreserveAbs):
692- __test__ = True
693-
694-
695 # vi: ts=4 expandtab syntax=python
696diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py
697index e9759bf..76fa9c3 100644
698--- a/tests/vmtests/test_preserve_partition_wipe_vg.py
699+++ b/tests/vmtests/test_preserve_partition_wipe_vg.py
700@@ -33,10 +33,6 @@ class JammyTestPreserveWipeLvm(relbase.jammy, TestPreserveWipeLvm):
701 __test__ = True
702
703
704-class ManticTestPreserveWipeLvm(relbase.mantic, TestPreserveWipeLvm):
705- __test__ = True
706-
707-
708 class TestPreserveWipeLvmSimple(VMBaseClass):
709 conf_file = "examples/tests/preserve-partition-wipe-vg-simple.yaml"
710 uefi = False
711@@ -60,10 +56,4 @@ class JammyTestPreserveWipeLvmSimple(relbase.jammy, TestPreserveWipeLvmSimple):
712 __test__ = True
713
714
715-class ManticTestPreserveWipeLvmSimple(
716- relbase.mantic, TestPreserveWipeLvmSimple
717-):
718- __test__ = True
719-
720-
721 # vi: ts=4 expandtab syntax=python
722diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
723index 7e42e7e..cf97203 100644
724--- a/tests/vmtests/test_preserve_raid.py
725+++ b/tests/vmtests/test_preserve_raid.py
726@@ -33,10 +33,6 @@ class JammyTestPreserveRAID(relbase.jammy, TestPreserveRAID):
727 __test__ = True
728
729
730-class ManticTestPreserveRAID(relbase.mantic, TestPreserveRAID):
731- __test__ = True
732-
733-
734 class TestPartitionExistingRAID(VMBaseClass):
735 """ Test that curtin can repartition an existing RAID. """
736 conf_file = "examples/tests/partition-existing-raid.yaml"
737@@ -70,9 +66,4 @@ class JammyTestPartitionExistingRAID(
738 __test__ = True
739
740
741-class ManticTestPartitionExistingRAID(
742- relbase.mantic, TestPartitionExistingRAID):
743- __test__ = True
744-
745-
746 # vi: ts=4 expandtab syntax=python
747diff --git a/tests/vmtests/test_python_apt.py b/tests/vmtests/test_python_apt.py
748index 1542275..ed2e007 100644
749--- a/tests/vmtests/test_python_apt.py
750+++ b/tests/vmtests/test_python_apt.py
751@@ -35,8 +35,4 @@ class JammyTestPythonApt(relbase.jammy, TestPythonApt):
752 __test__ = True
753
754
755-class ManticTestPythonApt(relbase.mantic, TestPythonApt):
756- __test__ = True
757-
758-
759 # vi: ts=4 expandtab syntax=python
760diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
761index 53f55cc..e04120d 100644
762--- a/tests/vmtests/test_raid5_bcache.py
763+++ b/tests/vmtests/test_raid5_bcache.py
764@@ -96,8 +96,4 @@ class JammyTestRaid5Bcache(relbase.jammy, TestMdadmBcacheAbs):
765 __test__ = True
766
767
768-class ManticTestRaid5Bcache(relbase.mantic, TestMdadmBcacheAbs):
769- __test__ = True
770-
771-
772 # vi: ts=4 expandtab syntax=python
773diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py
774index 7a18abe..fa1939c 100644
775--- a/tests/vmtests/test_raid_partition_to_disk.py
776+++ b/tests/vmtests/test_raid_partition_to_disk.py
777@@ -26,8 +26,4 @@ class JammyTestRAIDPartitionToDisk(relbase.jammy, TestRAIDPartitionToDisk):
778 __test__ = True
779
780
781-class ManticTestRAIDPartitionToDisk(relbase.mantic, TestRAIDPartitionToDisk):
782- __test__ = True
783-
784-
785 # vi: ts=4 expandtab syntax=python
786diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py
787index e22598e..cd7efd6 100644
788--- a/tests/vmtests/test_reuse_lvm_member.py
789+++ b/tests/vmtests/test_reuse_lvm_member.py
790@@ -31,9 +31,4 @@ class JammyTestReuseLVMMemberPartition(relbase.jammy,
791 __test__ = True
792
793
794-class ManticTestReuseLVMMemberPartition(relbase.mantic,
795- TestReuseLVMMemberPartition):
796- __test__ = True
797-
798-
799 # vi: ts=4 expandtab syntax=python
800diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py
801index 562db39..1561f3f 100644
802--- a/tests/vmtests/test_reuse_msdos_partitions.py
803+++ b/tests/vmtests/test_reuse_msdos_partitions.py
804@@ -28,9 +28,4 @@ class JammyTestReuseMSDOSPartitions(relbase.jammy,
805 __test__ = True
806
807
808-class ManticTestReuseMSDOSPartitions(relbase.mantic,
809- TestReuseMSDOSPartitions):
810- __test__ = True
811-
812-
813 # vi: ts=4 expandtab syntax=python
814diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py
815index 7eb96b4..43c7185 100644
816--- a/tests/vmtests/test_reuse_raid_member.py
817+++ b/tests/vmtests/test_reuse_raid_member.py
818@@ -36,10 +36,6 @@ class JammyTestReuseRAIDMember(relbase.jammy, TestReuseRAIDMember):
819 __test__ = True
820
821
822-class ManticTestReuseRAIDMember(relbase.mantic, TestReuseRAIDMember):
823- __test__ = True
824-
825-
826 class BionicTestReuseRAIDMemberPartition(relbase.bionic,
827 TestReuseRAIDMemberPartition):
828 __test__ = True
829@@ -55,9 +51,4 @@ class JammyTestReuseRAIDMemberPartition(relbase.jammy,
830 __test__ = True
831
832
833-class ManticTestReuseRAIDMemberPartition(relbase.mantic,
834- TestReuseRAIDMemberPartition):
835- __test__ = True
836-
837-
838 # vi: ts=4 expandtab syntax=python
839diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
840index f2207b5..3116505 100644
841--- a/tests/vmtests/test_reuse_uefi_esp.py
842+++ b/tests/vmtests/test_reuse_uefi_esp.py
843@@ -48,11 +48,4 @@ class JammyTestUefiReuseEsp(relbase.jammy, TestUefiReuseEspAbs):
844 return super().test_efiboot_menu_has_one_distro_entry()
845
846
847-class ManticTestUefiReuseEsp(relbase.mantic, TestUefiReuseEspAbs):
848- __test__ = True
849-
850- def test_efiboot_menu_has_one_distro_entry(self):
851- return super().test_efiboot_menu_has_one_distro_entry()
852-
853-
854 # vi: ts=4 expandtab syntax=python
855diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
856index be87f72..57010f5 100644
857--- a/tests/vmtests/test_simple.py
858+++ b/tests/vmtests/test_simple.py
859@@ -54,13 +54,6 @@ class JammyTestSimple(relbase.jammy, TestSimple):
860 self.output_files_exist(["netplan.yaml"])
861
862
863-class ManticTestSimple(relbase.mantic, TestSimple):
864- __test__ = True
865-
866- def test_output_files_exist(self):
867- self.output_files_exist(["netplan.yaml"])
868-
869-
870 class TestSimpleStorage(VMBaseClass):
871 """ Test curtin runs clear-holders when mode=simple with storage cfg. """
872 conf_file = "examples/tests/simple-storage.yaml"
873@@ -117,13 +110,6 @@ class JammyTestSimpleStorage(relbase.jammy, TestSimpleStorage):
874 self.output_files_exist(["netplan.yaml"])
875
876
877-class ManticTestSimpleStorage(relbase.mantic, TestSimpleStorage):
878- __test__ = True
879-
880- def test_output_files_exist(self):
881- self.output_files_exist(["netplan.yaml"])
882-
883-
884 class TestGrubNoDefaults(VMBaseClass):
885 """ Test that curtin does not emit any grub configuration files. """
886 conf_file = "examples/tests/no-grub-file.yaml"
887@@ -157,11 +143,4 @@ class JammyTestGrubNoDefaults(relbase.jammy, TestGrubNoDefaults):
888 self.output_files_exist(["netplan.yaml"])
889
890
891-class ManticTestGrubNoDefaults(relbase.mantic, TestGrubNoDefaults):
892- __test__ = True
893-
894- def test_output_files_exist(self):
895- self.output_files_exist(["netplan.yaml"])
896-
897-
898 # vi: ts=4 expandtab syntax=python
899diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
900index 1eeae61..e962e09 100644
901--- a/tests/vmtests/test_uefi_basic.py
902+++ b/tests/vmtests/test_uefi_basic.py
903@@ -104,10 +104,6 @@ class JammyUefiTestBasic(relbase.jammy, TestBasicAbs):
904 __test__ = True
905
906
907-class ManticUefiTestBasic(relbase.mantic, TestBasicAbs):
908- __test__ = True
909-
910-
911 class Centos70UefiTestBasic4k(centos_relbase.centos70_xenial, TestBasicAbs):
912 __test__ = True
913 disk_block_size = 4096
914@@ -133,9 +129,4 @@ class JammyUefiTestBasic4k(relbase.jammy, TestBasicAbs):
915 disk_block_size = 4096
916
917
918-class ManticUefiTestBasic4k(relbase.mantic, TestBasicAbs):
919- __test__ = True
920- disk_block_size = 4096
921-
922-
923 # vi: ts=4 expandtab syntax=python
924diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
925index 1bb8fd3..1ea6ca0 100644
926--- a/tests/vmtests/test_zfsroot.py
927+++ b/tests/vmtests/test_zfsroot.py
928@@ -106,11 +106,6 @@ class JammyTestZfsRoot(relbase.jammy, TestZfsRootAbs):
929 mem = 4096
930
931
932-class ManticTestZfsRoot(relbase.mantic, TestZfsRootAbs):
933- __test__ = True
934- mem = 4096
935-
936-
937 class TestZfsRootFsTypeAbs(TestZfsRootAbs):
938 conf_file = "examples/tests/basic-zfsroot.yaml"
939
940@@ -140,9 +135,4 @@ class JammyTestZfsRootFsType(relbase.jammy, TestZfsRootFsTypeAbs):
941 mem = 4096
942
943
944-class ManticTestZfsRootFsType(relbase.mantic, TestZfsRootFsTypeAbs):
945- __test__ = True
946- mem = 4096
947-
948-
949 # vi: ts=4 expandtab syntax=python

Subscribers

People subscribed via source and target branches