curtin

Merge ~dbungert/curtin:vmtest-cleanup-2023-09-19 into curtin:master

  1. Git
  2. lp:~dbungert/curtin
  3. vmtest-cleanup-2023-09-19
  4. Merge into master
Proposed by Dan Bungert
Status: Merged
Merge reported by: Dan Bungert
Merged at revision: 321360ef2c62c33a2d94857e065c62b17aee0b30
Proposed branch: ~dbungert/curtin:vmtest-cleanup-2023-09-19
Merge into: curtin:master
Diff against target: 1315 lines (+179/-167)
52 files modified
tests/vmtests/helpers.py (+4/-0)
tests/vmtests/releases.py (+10/-10)
tests/vmtests/test_apt_config_cmd.py (+2/-2)
tests/vmtests/test_basic.py (+4/-4)
tests/vmtests/test_basic_dasd.py (+2/-2)
tests/vmtests/test_bcache_basic.py (+2/-2)
tests/vmtests/test_bcache_bug1718699.py (+2/-2)
tests/vmtests/test_bcache_ceph.py (+4/-4)
tests/vmtests/test_bcache_partitions.py (+2/-2)
tests/vmtests/test_fs_battery.py (+2/-2)
tests/vmtests/test_iscsi.py (+2/-2)
tests/vmtests/test_journald_reporter.py (+2/-2)
tests/vmtests/test_lvm.py (+2/-2)
tests/vmtests/test_lvm_iscsi.py (+2/-2)
tests/vmtests/test_lvm_raid.py (+5/-2)
tests/vmtests/test_lvm_root.py (+4/-4)
tests/vmtests/test_mdadm_bcache.py (+18/-18)
tests/vmtests/test_mdadm_iscsi.py (+2/-2)
tests/vmtests/test_multipath.py (+4/-4)
tests/vmtests/test_multipath_lvm.py (+5/-5)
tests/vmtests/test_network.py (+2/-2)
tests/vmtests/test_network_alias.py (+2/-2)
tests/vmtests/test_network_bonding.py (+2/-2)
tests/vmtests/test_network_bridging.py (+2/-2)
tests/vmtests/test_network_disabled.py (+10/-10)
tests/vmtests/test_network_ipv6.py (+2/-2)
tests/vmtests/test_network_ipv6_static.py (+2/-2)
tests/vmtests/test_network_ipv6_vlan.py (+2/-2)
tests/vmtests/test_network_mtu.py (+2/-2)
tests/vmtests/test_network_ovs.py (+2/-2)
tests/vmtests/test_network_static.py (+2/-2)
tests/vmtests/test_network_static_routes.py (+3/-3)
tests/vmtests/test_network_vlan.py (+2/-2)
tests/vmtests/test_nvme.py (+8/-4)
tests/vmtests/test_panic.py (+2/-2)
tests/vmtests/test_pollinate_useragent.py (+2/-2)
tests/vmtests/test_preserve.py (+2/-2)
tests/vmtests/test_preserve_bcache.py (+2/-2)
tests/vmtests/test_preserve_lvm.py (+2/-2)
tests/vmtests/test_preserve_partition_wipe_vg.py (+6/-6)
tests/vmtests/test_preserve_raid.py (+6/-6)
tests/vmtests/test_python_apt.py (+2/-2)
tests/vmtests/test_raid5_bcache.py (+2/-2)
tests/vmtests/test_raid_partition_to_disk.py (+2/-2)
tests/vmtests/test_reuse_lvm_member.py (+3/-3)
tests/vmtests/test_reuse_msdos_partitions.py (+3/-3)
tests/vmtests/test_reuse_raid_member.py (+5/-5)
tests/vmtests/test_reuse_uefi_esp.py (+2/-2)
tests/vmtests/test_simple.py (+6/-6)
tests/vmtests/test_uefi_basic.py (+4/-4)
tests/vmtests/test_zfsroot.py (+4/-4)
tools/vmtest-system-setup (+1/-0)
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+451677@code.launchpad.net

Commit message

vmtests: several fixes to modernize

* Update vmtests
* Make test loading failures more verbose
* fix the vmtest-system-setup script for python3-debian

To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) wrote :

Thanks to Chad Smith for starting the process on https://code.launchpad.net/~chad.smith/curtin/+git/curtin/+merge/443701.

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

FAILED: Continuous integration, rev:0a031245d0fd55dc3120d7afca77495e405ec14c
https://jenkins.canonical.com/server-team/job/curtin-ci/201/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/201/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/201/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/201/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/201/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/201//rebuild

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

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

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/202//rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Hudson-Doyle (mwhudson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/vmtests/helpers.py b/tests/vmtests/helpers.py
2index 835baed..4c9f40c 100644
3--- a/tests/vmtests/helpers.py
4+++ b/tests/vmtests/helpers.py
5@@ -122,6 +122,10 @@ def find_testcases(**kwargs):
6 filter_attrs = [attr for attr, value in kwargs.items() if value]
7 for mts in module_test_suites:
8 for class_test_suite in mts:
9+ if hasattr(class_test_suite, '_exception'):
10+ # if the test fails to load, it may have an _exception with the
11+ # underlying issue.
12+ raise class_test_suite._exception
13 for test_case in class_test_suite:
14 # skip disabled tests
15 if not getattr(test_case, '__test__', False):
16diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
17index 67248bf..7519c57 100644
18--- a/tests/vmtests/releases.py
19+++ b/tests/vmtests/releases.py
20@@ -165,18 +165,18 @@ class _FocalBase(_UbuntuBase):
21 subarch = "ga-20.04"
22
23
24-class _HirsuteBase(_UbuntuBase):
25- release = "hirsute"
26- target_release = "hirsute"
27+class _JammyBase(_UbuntuBase):
28+ release = "jammy"
29+ target_release = "jammy"
30 if _UbuntuBase.arch == "arm64":
31- subarch = "ga-21.04"
32+ subarch = "ga-22.04"
33
34
35-class _ImpishBase(_UbuntuBase):
36- release = "impish"
37- target_release = "impish"
38+class _ManticBase(_UbuntuBase):
39+ release = "mantic"
40+ target_release = "mantic"
41 if _UbuntuBase.arch == "arm64":
42- subarch = "ga-21.10"
43+ subarch = "ga-23.10"
44
45
46 class _Releases(object):
47@@ -197,8 +197,8 @@ class _Releases(object):
48 disco = _DiscoBase
49 eoan = _EoanBase
50 focal = _FocalBase
51- hirsute = _HirsuteBase
52- impish = _ImpishBase
53+ jammy = _JammyBase
54+ mantic = _ManticBase
55
56
57 class _CentosReleases(object):
58diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
59index 2fdd971..50ea224 100644
60--- a/tests/vmtests/test_apt_config_cmd.py
61+++ b/tests/vmtests/test_apt_config_cmd.py
62@@ -68,11 +68,11 @@ class FocalTestAptConfigCMDCMD(relbase.focal, TestAptConfigCMD):
63 __test__ = True
64
65
66-class HirsuteTestAptConfigCMDCMD(relbase.hirsute, TestAptConfigCMD):
67+class JammyTestAptConfigCMDCMD(relbase.jammy, TestAptConfigCMD):
68 __test__ = True
69
70
71-class ImpishTestAptConfigCMDCMD(relbase.impish, TestAptConfigCMD):
72+class ManticTestAptConfigCMDCMD(relbase.mantic, TestAptConfigCMD):
73 __test__ = True
74
75
76diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
77index 616d635..1a99395 100644
78--- a/tests/vmtests/test_basic.py
79+++ b/tests/vmtests/test_basic.py
80@@ -234,11 +234,11 @@ class FocalTestBasic(relbase.focal, TestBasicAbs):
81 __test__ = True
82
83
84-class HirsuteTestBasic(relbase.hirsute, TestBasicAbs):
85+class JammyTestBasic(relbase.jammy, TestBasicAbs):
86 __test__ = True
87
88
89-class ImpishTestBasic(relbase.impish, TestBasicAbs):
90+class ManticTestBasic(relbase.mantic, TestBasicAbs):
91 __test__ = True
92
93
94@@ -358,11 +358,11 @@ class FocalTestScsiBasic(relbase.focal, TestBasicScsiAbs):
95 __test__ = True
96
97
98-class HirsuteTestScsiBasic(relbase.hirsute, TestBasicScsiAbs):
99+class JammyTestScsiBasic(relbase.jammy, TestBasicScsiAbs):
100 __test__ = True
101
102
103-class ImpishTestScsiBasic(relbase.impish, TestBasicScsiAbs):
104+class ManticTestScsiBasic(relbase.mantic, TestBasicScsiAbs):
105 __test__ = True
106
107
108diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
109index 0aa35fd..3ab7544 100644
110--- a/tests/vmtests/test_basic_dasd.py
111+++ b/tests/vmtests/test_basic_dasd.py
112@@ -56,11 +56,11 @@ class FocalTestBasicDasd(relbase.focal, TestBasicDasd):
113 __test__ = True
114
115
116-class HirsuteTestBasicDasd(relbase.hirsute, TestBasicDasd):
117+class JammyTestBasicDasd(relbase.jammy, TestBasicDasd):
118 __test__ = True
119
120
121-class ImpishTestBasicDasd(relbase.impish, TestBasicDasd):
122+class ManticTestBasicDasd(relbase.mantic, TestBasicDasd):
123 __test__ = True
124
125
126diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
127index 490ae4c..f4d8731 100644
128--- a/tests/vmtests/test_bcache_basic.py
129+++ b/tests/vmtests/test_bcache_basic.py
130@@ -68,11 +68,11 @@ class FocalBcacheBasic(relbase.focal, TestBcacheBasic):
131 __test__ = True
132
133
134-class HirsuteBcacheBasic(relbase.hirsute, TestBcacheBasic):
135+class JammyBcacheBasic(relbase.jammy, TestBcacheBasic):
136 __test__ = True
137
138
139-class ImpishBcacheBasic(relbase.impish, TestBcacheBasic):
140+class ManticBcacheBasic(relbase.mantic, TestBcacheBasic):
141 __test__ = True
142
143
144diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
145index 3b19c41..6eb781c 100644
146--- a/tests/vmtests/test_bcache_bug1718699.py
147+++ b/tests/vmtests/test_bcache_bug1718699.py
148@@ -23,11 +23,11 @@ class FocalTestBcacheBug1718699(relbase.focal, TestBcacheBug1718699):
149 __test__ = True
150
151
152-class HirsuteTestBcacheBug1718699(relbase.hirsute, TestBcacheBug1718699):
153+class JammyTestBcacheBug1718699(relbase.jammy, TestBcacheBug1718699):
154 __test__ = True
155
156
157-class ImpishTestBcacheBug1718699(relbase.impish, TestBcacheBug1718699):
158+class ManticTestBcacheBug1718699(relbase.mantic, TestBcacheBug1718699):
159 __test__ = True
160
161
162diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
163index 713ade9..9bc7287 100644
164--- a/tests/vmtests/test_bcache_ceph.py
165+++ b/tests/vmtests/test_bcache_ceph.py
166@@ -79,11 +79,11 @@ class FocalTestBcacheCeph(relbase.focal, TestBcacheCeph):
167 __test__ = True
168
169
170-class HirsuteTestBcacheCeph(relbase.hirsute, TestBcacheCeph):
171+class JammyTestBcacheCeph(relbase.jammy, TestBcacheCeph):
172 __test__ = True
173
174
175-class ImpishTestBcacheCeph(relbase.impish, TestBcacheCeph):
176+class ManticTestBcacheCeph(relbase.mantic, TestBcacheCeph):
177 __test__ = True
178
179
180@@ -113,11 +113,11 @@ class FocalTestBcacheCephLvm(relbase.focal, TestBcacheCephLvm):
181 __test__ = True
182
183
184-class HirsuteTestBcacheCephLvm(relbase.hirsute, TestBcacheCephLvm):
185+class JammyTestBcacheCephLvm(relbase.jammy, TestBcacheCephLvm):
186 __test__ = True
187
188
189-class ImpishTestBcacheCephLvm(relbase.impish, TestBcacheCephLvm):
190+class ManticTestBcacheCephLvm(relbase.mantic, TestBcacheCephLvm):
191 __test__ = True
192
193
194diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
195index 6268fd5..52cfd03 100644
196--- a/tests/vmtests/test_bcache_partitions.py
197+++ b/tests/vmtests/test_bcache_partitions.py
198@@ -29,11 +29,11 @@ class FocalTestBcachePartitions(relbase.focal, TestBcachePartitions):
199 __test__ = True
200
201
202-class HirsuteTestBcachePartitions(relbase.hirsute, TestBcachePartitions):
203+class JammyTestBcachePartitions(relbase.jammy, TestBcachePartitions):
204 __test__ = True
205
206
207-class ImpishTestBcachePartitions(relbase.impish, TestBcachePartitions):
208+class ManticTestBcachePartitions(relbase.mantic, TestBcachePartitions):
209 __test__ = True
210
211
212diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
213index 7d70f9c..034f10f 100644
214--- a/tests/vmtests/test_fs_battery.py
215+++ b/tests/vmtests/test_fs_battery.py
216@@ -243,11 +243,11 @@ class FocalTestFsBattery(relbase.focal, TestFsBattery):
217 __test__ = True
218
219
220-class HirsuteTestFsBattery(relbase.hirsute, TestFsBattery):
221+class JammyTestFsBattery(relbase.jammy, TestFsBattery):
222 __test__ = True
223
224
225-class ImpishTestFsBattery(relbase.impish, TestFsBattery):
226+class ManticTestFsBattery(relbase.mantic, TestFsBattery):
227 __test__ = True
228
229
230diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
231index 2fd9866..05c28fc 100644
232--- a/tests/vmtests/test_iscsi.py
233+++ b/tests/vmtests/test_iscsi.py
234@@ -76,11 +76,11 @@ class FocalTestIscsiBasic(relbase.focal, TestBasicIscsiAbs):
235 __test__ = True
236
237
238-class HirsuteTestIscsiBasic(relbase.hirsute, TestBasicIscsiAbs):
239+class JammyTestIscsiBasic(relbase.jammy, TestBasicIscsiAbs):
240 __test__ = True
241
242
243-class ImpishTestIscsiBasic(relbase.impish, TestBasicIscsiAbs):
244+class ManticTestIscsiBasic(relbase.mantic, TestBasicIscsiAbs):
245 __test__ = True
246
247
248diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
249index 064d71a..299fef7 100644
250--- a/tests/vmtests/test_journald_reporter.py
251+++ b/tests/vmtests/test_journald_reporter.py
252@@ -36,11 +36,11 @@ class FocalTestJournaldReporter(relbase.focal, TestJournaldReporter):
253 __test__ = True
254
255
256-class HirsuteTestJournaldReporter(relbase.hirsute, TestJournaldReporter):
257+class JammyTestJournaldReporter(relbase.jammy, TestJournaldReporter):
258 __test__ = True
259
260
261-class ImpishTestJournaldReporter(relbase.impish, TestJournaldReporter):
262+class ManticTestJournaldReporter(relbase.mantic, TestJournaldReporter):
263 __test__ = True
264
265
266diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
267index a0ce90d..052d339 100644
268--- a/tests/vmtests/test_lvm.py
269+++ b/tests/vmtests/test_lvm.py
270@@ -81,11 +81,11 @@ class FocalTestLvm(relbase.focal, TestLvmAbs):
271 __test__ = True
272
273
274-class HirsuteTestLvm(relbase.hirsute, TestLvmAbs):
275+class JammyTestLvm(relbase.jammy, TestLvmAbs):
276 __test__ = True
277
278
279-class ImpishTestLvm(relbase.impish, TestLvmAbs):
280+class ManticTestLvm(relbase.mantic, TestLvmAbs):
281 __test__ = True
282
283
284diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
285index 463d863..76117c1 100644
286--- a/tests/vmtests/test_lvm_iscsi.py
287+++ b/tests/vmtests/test_lvm_iscsi.py
288@@ -99,11 +99,11 @@ class FocalTestIscsiLvm(relbase.focal, TestLvmIscsiAbs):
289 __test__ = True
290
291
292-class HirsuteTestIscsiLvm(relbase.hirsute, TestLvmIscsiAbs):
293+class JammyTestIscsiLvm(relbase.jammy, TestLvmIscsiAbs):
294 __test__ = True
295
296
297-class ImpishTestIscsiLvm(relbase.impish, TestLvmIscsiAbs):
298+class ManticTestIscsiLvm(relbase.mantic, TestLvmIscsiAbs):
299 __test__ = True
300
301
302diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
303index 650fc25..d9eb9ff 100644
304--- a/tests/vmtests/test_lvm_raid.py
305+++ b/tests/vmtests/test_lvm_raid.py
306@@ -59,9 +59,12 @@ class FocalTestLvmOverRaid(relbase.focal, TestLvmOverRaidAbs):
307 __test__ = True
308
309
310-class HirsuteTestLvmOverRaid(relbase.hirsute, TestLvmOverRaidAbs):
311+class JammyTestLvmOverRaid(relbase.jammy, TestLvmOverRaidAbs):
312 __test__ = True
313
314
315-class ImpishTestLvmOverRaid(relbase.impish, TestLvmOverRaidAbs):
316+class ManticTestLvmOverRaid(relbase.mantic, TestLvmOverRaidAbs):
317 __test__ = True
318+
319+
320+# vi: ts=4 expandtab syntax=python
321diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
322index bc09e8d..3d14a2b 100644
323--- a/tests/vmtests/test_lvm_root.py
324+++ b/tests/vmtests/test_lvm_root.py
325@@ -94,14 +94,14 @@ class FocalTestLvmRootExt4(relbase.focal, TestLvmRootAbs):
326 }
327
328
329-class HirsuteTestLvmRootExt4(relbase.hirsute, TestLvmRootAbs):
330+class JammyTestLvmRootExt4(relbase.jammy, TestLvmRootAbs):
331 __test__ = True
332 conf_replace = {
333 '__ROOTFS_FORMAT__': 'ext4',
334 }
335
336
337-class ImpishTestLvmRootExt4(relbase.impish, TestLvmRootAbs):
338+class ManticTestLvmRootExt4(relbase.mantic, TestLvmRootAbs):
339 __test__ = True
340 conf_replace = {
341 '__ROOTFS_FORMAT__': 'ext4',
342@@ -154,7 +154,7 @@ class FocalTestUefiLvmRootExt4(relbase.focal, TestUefiLvmRootAbs):
343 }
344
345
346-class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs):
347+class JammyTestUefiLvmRootExt4(relbase.jammy, TestUefiLvmRootAbs):
348 __test__ = True
349 conf_replace = {
350 '__BOOTFS_FORMAT__': 'ext4',
351@@ -162,7 +162,7 @@ class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs):
352 }
353
354
355-class ImpishTestUefiLvmRootExt4(relbase.impish, TestUefiLvmRootAbs):
356+class ManticTestUefiLvmRootExt4(relbase.mantic, TestUefiLvmRootAbs):
357 __test__ = True
358 conf_replace = {
359 '__BOOTFS_FORMAT__': 'ext4',
360diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
361index d90f478..95c2d58 100644
362--- a/tests/vmtests/test_mdadm_bcache.py
363+++ b/tests/vmtests/test_mdadm_bcache.py
364@@ -158,11 +158,11 @@ class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs):
365 __test__ = True
366
367
368-class HirsuteTestMdadmBcache(relbase.hirsute, TestMdadmBcacheAbs):
369+class JammyTestMdadmBcache(relbase.jammy, TestMdadmBcacheAbs):
370 __test__ = True
371
372
373-class ImpishTestMdadmBcache(relbase.impish, TestMdadmBcacheAbs):
374+class ManticTestMdadmBcache(relbase.mantic, TestMdadmBcacheAbs):
375 __test__ = True
376
377
378@@ -207,11 +207,11 @@ class FocalTestMirrorboot(relbase.focal, TestMirrorbootAbs):
379 __test__ = True
380
381
382-class HirsuteTestMirrorboot(relbase.hirsute, TestMirrorbootAbs):
383+class JammyTestMirrorboot(relbase.jammy, TestMirrorbootAbs):
384 __test__ = True
385
386
387-class ImpishTestMirrorboot(relbase.impish, TestMirrorbootAbs):
388+class ManticTestMirrorboot(relbase.mantic, TestMirrorbootAbs):
389 __test__ = True
390
391
392@@ -260,12 +260,12 @@ class FocalTestMirrorbootPartitions(relbase.focal,
393 __test__ = True
394
395
396-class HirsuteTestMirrorbootPartitions(relbase.hirsute,
397- TestMirrorbootPartitionsAbs):
398+class JammyTestMirrorbootPartitions(relbase.jammy,
399+ TestMirrorbootPartitionsAbs):
400 __test__ = True
401
402
403-class ImpishTestMirrorbootPartitions(relbase.impish,
404+class ManticTestMirrorbootPartitions(relbase.mantic,
405 TestMirrorbootPartitionsAbs):
406 __test__ = True
407
408@@ -360,12 +360,12 @@ class FocalTestMirrorbootPartitionsUEFI(relbase.focal,
409 __test__ = True
410
411
412-class HirsuteTestMirrorbootPartitionsUEFI(relbase.hirsute,
413- TestMirrorbootPartitionsUEFIAbs):
414+class JammyTestMirrorbootPartitionsUEFI(relbase.jammy,
415+ TestMirrorbootPartitionsUEFIAbs):
416 __test__ = True
417
418
419-class ImpishTestMirrorbootPartitionsUEFI(relbase.impish,
420+class ManticTestMirrorbootPartitionsUEFI(relbase.mantic,
421 TestMirrorbootPartitionsUEFIAbs):
422 __test__ = True
423
424@@ -414,11 +414,11 @@ class FocalTestRaid5boot(relbase.focal, TestRaid5bootAbs):
425 __test__ = True
426
427
428-class HirsuteTestRaid5boot(relbase.hirsute, TestRaid5bootAbs):
429+class JammyTestRaid5boot(relbase.jammy, TestRaid5bootAbs):
430 __test__ = True
431
432
433-class ImpishTestRaid5boot(relbase.impish, TestRaid5bootAbs):
434+class ManticTestRaid5boot(relbase.mantic, TestRaid5bootAbs):
435 __test__ = True
436
437
438@@ -479,11 +479,11 @@ class FocalTestRaid6boot(relbase.focal, TestRaid6bootAbs):
439 __test__ = True
440
441
442-class HirsuteTestRaid6boot(relbase.hirsute, TestRaid6bootAbs):
443+class JammyTestRaid6boot(relbase.jammy, TestRaid6bootAbs):
444 __test__ = True
445
446
447-class ImpishTestRaid6boot(relbase.impish, TestRaid6bootAbs):
448+class ManticTestRaid6boot(relbase.mantic, TestRaid6bootAbs):
449 __test__ = True
450
451
452@@ -530,11 +530,11 @@ class FocalTestRaid10boot(relbase.focal, TestRaid10bootAbs):
453 __test__ = True
454
455
456-class HirsuteTestRaid10boot(relbase.hirsute, TestRaid10bootAbs):
457+class JammyTestRaid10boot(relbase.jammy, TestRaid10bootAbs):
458 __test__ = True
459
460
461-class ImpishTestRaid10boot(relbase.impish, TestRaid10bootAbs):
462+class ManticTestRaid10boot(relbase.mantic, TestRaid10bootAbs):
463 __test__ = True
464
465
466@@ -638,11 +638,11 @@ class FocalTestAllindata(relbase.focal, TestAllindataAbs):
467 __test__ = True
468
469
470-class HirsuteTestAllindata(relbase.hirsute, TestAllindataAbs):
471+class JammyTestAllindata(relbase.jammy, TestAllindataAbs):
472 __test__ = True
473
474
475-class ImpishTestAllindata(relbase.impish, TestAllindataAbs):
476+class ManticTestAllindata(relbase.mantic, TestAllindataAbs):
477 __test__ = True
478
479
480diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
481index f6f0b22..7280082 100644
482--- a/tests/vmtests/test_mdadm_iscsi.py
483+++ b/tests/vmtests/test_mdadm_iscsi.py
484@@ -54,11 +54,11 @@ class FocalTestIscsiMdadm(relbase.focal, TestMdadmIscsiAbs):
485 __test__ = True
486
487
488-class HirsuteTestIscsiMdadm(relbase.hirsute, TestMdadmIscsiAbs):
489+class JammyTestIscsiMdadm(relbase.jammy, TestMdadmIscsiAbs):
490 __test__ = True
491
492
493-class ImpishTestIscsiMdadm(relbase.impish, TestMdadmIscsiAbs):
494+class ManticTestIscsiMdadm(relbase.mantic, TestMdadmIscsiAbs):
495 __test__ = True
496
497
498diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
499index ac85a58..28b5acd 100644
500--- a/tests/vmtests/test_multipath.py
501+++ b/tests/vmtests/test_multipath.py
502@@ -162,11 +162,11 @@ class FocalTestMultipathBasic(relbase.focal, TestMultipathBasicAbs):
503 __test__ = True
504
505
506-class HirsuteTestMultipathBasic(relbase.hirsute, TestMultipathBasicAbs):
507+class JammyTestMultipathBasic(relbase.jammy, TestMultipathBasicAbs):
508 __test__ = True
509
510
511-class ImpishTestMultipathBasic(relbase.impish, TestMultipathBasicAbs):
512+class ManticTestMultipathBasic(relbase.mantic, TestMultipathBasicAbs):
513 __test__ = True
514
515
516@@ -178,11 +178,11 @@ class FocalTestMultipathReuse(relbase.focal, TestMultipathReuseAbs):
517 __test__ = True
518
519
520-class HirsuteTestMultipathReuse(relbase.hirsute, TestMultipathReuseAbs):
521+class JammyTestMultipathReuse(relbase.jammy, TestMultipathReuseAbs):
522 __test__ = True
523
524
525-class ImpishTestMultipathReuse(relbase.impish, TestMultipathReuseAbs):
526+class ManticTestMultipathReuse(relbase.mantic, TestMultipathReuseAbs):
527 __test__ = True
528
529
530diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py
531index 97d797e..1d60be7 100644
532--- a/tests/vmtests/test_multipath_lvm.py
533+++ b/tests/vmtests/test_multipath_lvm.py
534@@ -60,11 +60,11 @@ class FocalTestMultipathLvm(relbase.focal, TestMultipathLvmAbs):
535 __test__ = True
536
537
538-class HirsuteTestMultipathLvm(relbase.hirsute, TestMultipathLvmAbs):
539+class JammyTestMultipathLvm(relbase.jammy, TestMultipathLvmAbs):
540 __test__ = True
541
542
543-class ImpishTestMultipathLvm(relbase.impish, TestMultipathLvmAbs):
544+class ManticTestMultipathLvm(relbase.mantic, TestMultipathLvmAbs):
545 __test__ = True
546
547
548@@ -77,12 +77,12 @@ class FocalTestMultipathLvmPartWipe(relbase.focal,
549 __test__ = True
550
551
552-class HirsuteTestMultipathLvmPartWipe(relbase.hirsute,
553- TestMultipathLvmPartWipeAbs):
554+class JammyTestMultipathLvmPartWipe(relbase.jammy,
555+ TestMultipathLvmPartWipeAbs):
556 __test__ = True
557
558
559-class ImpishTestMultipathLvmPartWipe(relbase.impish,
560+class ManticTestMultipathLvmPartWipe(relbase.mantic,
561 TestMultipathLvmPartWipeAbs):
562 __test__ = True
563
564diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
565index 6ff3a16..e838934 100644
566--- a/tests/vmtests/test_network.py
567+++ b/tests/vmtests/test_network.py
568@@ -478,11 +478,11 @@ class FocalTestNetworkBasic(relbase.focal, TestNetworkBasicAbs):
569 __test__ = True
570
571
572-class HirsuteTestNetworkBasic(relbase.hirsute, TestNetworkBasicAbs):
573+class JammyTestNetworkBasic(relbase.jammy, TestNetworkBasicAbs):
574 __test__ = True
575
576
577-class ImpishTestNetworkBasic(relbase.impish, TestNetworkBasicAbs):
578+class ManticTestNetworkBasic(relbase.mantic, TestNetworkBasicAbs):
579 __test__ = True
580
581
582diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
583index dd6ba02..1570c8f 100644
584--- a/tests/vmtests/test_network_alias.py
585+++ b/tests/vmtests/test_network_alias.py
586@@ -51,11 +51,11 @@ class FocalTestNetworkAlias(relbase.focal, TestNetworkAliasAbs):
587 __test__ = True
588
589
590-class HirsuteTestNetworkAlias(relbase.hirsute, TestNetworkAliasAbs):
591+class JammyTestNetworkAlias(relbase.jammy, TestNetworkAliasAbs):
592 __test__ = True
593
594
595-class ImpishTestNetworkAlias(relbase.impish, TestNetworkAliasAbs):
596+class ManticTestNetworkAlias(relbase.mantic, TestNetworkAliasAbs):
597 __test__ = True
598
599
600diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
601index ad0c1d4..fb91179 100644
602--- a/tests/vmtests/test_network_bonding.py
603+++ b/tests/vmtests/test_network_bonding.py
604@@ -61,11 +61,11 @@ class FocalTestBonding(relbase.focal, TestNetworkBondingAbs):
605 __test__ = True
606
607
608-class HirsuteTestBonding(relbase.hirsute, TestNetworkBondingAbs):
609+class JammyTestBonding(relbase.jammy, TestNetworkBondingAbs):
610 __test__ = True
611
612
613-class ImpishTestBonding(relbase.impish, TestNetworkBondingAbs):
614+class ManticTestBonding(relbase.mantic, TestNetworkBondingAbs):
615 __test__ = True
616
617
618diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
619index 9c90702..a46841f 100644
620--- a/tests/vmtests/test_network_bridging.py
621+++ b/tests/vmtests/test_network_bridging.py
622@@ -233,11 +233,11 @@ class FocalTestBridging(relbase.focal, TestBridgeNetworkAbs):
623 __test__ = True
624
625
626-class HirsuteTestBridging(relbase.hirsute, TestBridgeNetworkAbs):
627+class JammyTestBridging(relbase.jammy, TestBridgeNetworkAbs):
628 __test__ = True
629
630
631-class ImpishTestBridging(relbase.impish, TestBridgeNetworkAbs):
632+class ManticTestBridging(relbase.mantic, TestBridgeNetworkAbs):
633 __test__ = True
634
635
636diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py
637index d56ebde..3494d38 100644
638--- a/tests/vmtests/test_network_disabled.py
639+++ b/tests/vmtests/test_network_disabled.py
640@@ -63,37 +63,37 @@ class FocalCurtinDisableNetworkRendering(relbase.focal, TestKlass1):
641 __test__ = True
642
643
644-class HirsuteCurtinDisableNetworkRendering(relbase.hirsute, TestKlass1):
645+class FocalCurtinDisableCloudInitNetworking(relbase.focal, TestKlass2):
646 __test__ = True
647
648
649-class ImpishCurtinDisableNetworkRendering(relbase.impish, TestKlass1):
650+class FocalCurtinDisableCloudInitNetworkingVersion1(relbase.focal, TestKlass3):
651 __test__ = True
652
653
654-class FocalCurtinDisableCloudInitNetworking(relbase.focal, TestKlass2):
655+class JammyCurtinDisableNetworkRendering(relbase.jammy, TestKlass1):
656 __test__ = True
657
658
659-class HirsuteCurtinDisableCloudInitNetworking(relbase.hirsute, TestKlass2):
660+class JammyCurtinDisableCloudInitNetworking(relbase.jammy, TestKlass2):
661 __test__ = True
662
663
664-class ImpishCurtinDisableCloudInitNetworking(relbase.impish, TestKlass2):
665+class JammyCurtinDisableCloudInitNetworkingVersion1(relbase.jammy, TestKlass3):
666 __test__ = True
667
668
669-class FocalCurtinDisableCloudInitNetworkingVersion1(relbase.focal, TestKlass3):
670+class ManticCurtinDisableNetworkRendering(relbase.mantic, TestKlass1):
671 __test__ = True
672
673
674-class HirsuteCurtinDisableCloudInitNetworkingVersion1(relbase.hirsute,
675- TestKlass3):
676+class ManticCurtinDisableCloudInitNetworking(relbase.mantic, TestKlass2):
677 __test__ = True
678
679
680-class ImpishCurtinDisableCloudInitNetworkingVersion1(relbase.impish,
681- TestKlass3):
682+class ManticCurtinDisableCloudInitNetworkingVersion1(
683+ relbase.mantic, TestKlass3
684+):
685 __test__ = True
686
687
688diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
689index f524e82..5b96b16 100644
690--- a/tests/vmtests/test_network_ipv6.py
691+++ b/tests/vmtests/test_network_ipv6.py
692@@ -57,11 +57,11 @@ class FocalTestNetworkIPV6(relbase.focal, TestNetworkIPV6Abs):
693 __test__ = True
694
695
696-class HirsuteTestNetworkIPV6(relbase.hirsute, TestNetworkIPV6Abs):
697+class JammyTestNetworkIPV6(relbase.jammy, TestNetworkIPV6Abs):
698 __test__ = True
699
700
701-class ImpishTestNetworkIPV6(relbase.impish, TestNetworkIPV6Abs):
702+class ManticTestNetworkIPV6(relbase.mantic, TestNetworkIPV6Abs):
703 __test__ = True
704
705
706diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
707index cb9caad..8e070e8 100644
708--- a/tests/vmtests/test_network_ipv6_static.py
709+++ b/tests/vmtests/test_network_ipv6_static.py
710@@ -27,11 +27,11 @@ class FocalTestNetworkIPV6Static(relbase.focal, TestNetworkIPV6StaticAbs):
711 __test__ = True
712
713
714-class HirsuteTestNetworkIPV6Static(relbase.hirsute, TestNetworkIPV6StaticAbs):
715+class JammyTestNetworkIPV6Static(relbase.jammy, TestNetworkIPV6StaticAbs):
716 __test__ = True
717
718
719-class ImpishTestNetworkIPV6Static(relbase.impish, TestNetworkIPV6StaticAbs):
720+class ManticTestNetworkIPV6Static(relbase.mantic, TestNetworkIPV6StaticAbs):
721 __test__ = True
722
723
724diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
725index 7955101..0e7e302 100644
726--- a/tests/vmtests/test_network_ipv6_vlan.py
727+++ b/tests/vmtests/test_network_ipv6_vlan.py
728@@ -26,11 +26,11 @@ class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs):
729 __test__ = True
730
731
732-class HirsuteTestNetworkIPV6Vlan(relbase.hirsute, TestNetworkIPV6VlanAbs):
733+class JammyTestNetworkIPV6Vlan(relbase.jammy, TestNetworkIPV6VlanAbs):
734 __test__ = True
735
736
737-class ImpishTestNetworkIPV6Vlan(relbase.impish, TestNetworkIPV6VlanAbs):
738+class ManticTestNetworkIPV6Vlan(relbase.mantic, TestNetworkIPV6VlanAbs):
739 __test__ = True
740
741
742diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
743index f112b1c..7aff7b2 100644
744--- a/tests/vmtests/test_network_mtu.py
745+++ b/tests/vmtests/test_network_mtu.py
746@@ -193,11 +193,11 @@ class FocalTestNetworkMtu(relbase.focal, TestNetworkMtuNetworkdAbs):
747 __test__ = True
748
749
750-class HirsuteTestNetworkMtu(relbase.hirsute, TestNetworkMtuNetworkdAbs):
751+class JammyTestNetworkMtu(relbase.jammy, TestNetworkMtuNetworkdAbs):
752 __test__ = True
753
754
755-class ImpishTestNetworkMtu(relbase.impish, TestNetworkMtuNetworkdAbs):
756+class ManticTestNetworkMtu(relbase.mantic, TestNetworkMtuNetworkdAbs):
757 __test__ = True
758
759
760diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py
761index 3e8699d..d6e23c8 100644
762--- a/tests/vmtests/test_network_ovs.py
763+++ b/tests/vmtests/test_network_ovs.py
764@@ -38,11 +38,11 @@ class FocalTestNetworkOvs(relbase.focal, TestNetworkOvsAbs):
765 __test__ = True
766
767
768-class HirsuteTestNetworkOvs(relbase.hirsute, TestNetworkOvsAbs):
769+class JammyTestNetworkOvs(relbase.jammy, TestNetworkOvsAbs):
770 __test__ = True
771
772
773-class ImpishTestNetworkOvs(relbase.impish, TestNetworkOvsAbs):
774+class ManticTestNetworkOvs(relbase.mantic, TestNetworkOvsAbs):
775 __test__ = True
776
777
778diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
779index 867cf11..9a2adb3 100644
780--- a/tests/vmtests/test_network_static.py
781+++ b/tests/vmtests/test_network_static.py
782@@ -32,11 +32,11 @@ class FocalTestNetworkStatic(relbase.focal, TestNetworkStaticAbs):
783 __test__ = True
784
785
786-class HirsuteTestNetworkStatic(relbase.hirsute, TestNetworkStaticAbs):
787+class JammyTestNetworkStatic(relbase.jammy, TestNetworkStaticAbs):
788 __test__ = True
789
790
791-class ImpishTestNetworkStatic(relbase.impish, TestNetworkStaticAbs):
792+class ManticTestNetworkStatic(relbase.mantic, TestNetworkStaticAbs):
793 __test__ = True
794
795
796diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
797index 664c035..8ddeeaf 100644
798--- a/tests/vmtests/test_network_static_routes.py
799+++ b/tests/vmtests/test_network_static_routes.py
800@@ -33,12 +33,12 @@ class FocalTestNetworkStaticRoutes(relbase.focal,
801 __test__ = True
802
803
804-class HirsuteTestNetworkStaticRoutes(relbase.hirsute,
805- TestNetworkStaticRoutesAbs):
806+class JammyTestNetworkStaticRoutes(relbase.jammy,
807+ TestNetworkStaticRoutesAbs):
808 __test__ = True
809
810
811-class ImpishTestNetworkStaticRoutes(relbase.impish,
812+class ManticTestNetworkStaticRoutes(relbase.mantic,
813 TestNetworkStaticRoutesAbs):
814 __test__ = True
815
816diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
817index 99bad66..6fca423 100644
818--- a/tests/vmtests/test_network_vlan.py
819+++ b/tests/vmtests/test_network_vlan.py
820@@ -80,11 +80,11 @@ class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs):
821 __test__ = True
822
823
824-class HirsuteTestNetworkVlan(relbase.hirsute, TestNetworkVlanAbs):
825+class JammyTestNetworkVlan(relbase.jammy, TestNetworkVlanAbs):
826 __test__ = True
827
828
829-class ImpishTestNetworkVlan(relbase.impish, TestNetworkVlanAbs):
830+class ManticTestNetworkVlan(relbase.mantic, TestNetworkVlanAbs):
831 __test__ = True
832
833
834diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
835index 6352f6d..d458fca 100644
836--- a/tests/vmtests/test_nvme.py
837+++ b/tests/vmtests/test_nvme.py
838@@ -79,12 +79,16 @@ class FocalTestNvme(relbase.focal, TestNvmeAbs):
839 # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
840
841
842-class HirsuteTestNvme(relbase.hirsute, TestNvmeAbs):
843+class JammyTestNvme(relbase.jammy, TestNvmeAbs):
844 __test__ = False
845+ # An error occured handling 'nvme_disk2':
846+ # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
847
848
849-class ImpishTestNvme(relbase.impish, TestNvmeAbs):
850+class ManticTestNvme(relbase.mantic, TestNvmeAbs):
851 __test__ = False
852+ # An error occured handling 'nvme_disk2':
853+ # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha'
854
855
856 class TestNvmeBcacheAbs(TestNvmeAbs):
857@@ -153,11 +157,11 @@ class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs):
858 __test__ = True
859
860
861-class HirsuteTestNvmeBcache(relbase.hirsute, TestNvmeBcacheAbs):
862+class JammyTestNvmeBcache(relbase.jammy, TestNvmeBcacheAbs):
863 __test__ = True
864
865
866-class ImpishTestNvmeBcache(relbase.impish, TestNvmeBcacheAbs):
867+class ManticTestNvmeBcache(relbase.mantic, TestNvmeBcacheAbs):
868 __test__ = True
869
870
871diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py
872index a5533f9..d3861e3 100644
873--- a/tests/vmtests/test_panic.py
874+++ b/tests/vmtests/test_panic.py
875@@ -29,11 +29,11 @@ class FocalTestInstallPanic(relbase.focal, TestInstallPanic):
876 __test__ = True
877
878
879-class HirsuteTestInstallPanic(relbase.hirsute, TestInstallPanic):
880+class JammyTestInstallPanic(relbase.jammy, TestInstallPanic):
881 __test__ = True
882
883
884-class ImpishTestInstallPanic(relbase.impish, TestInstallPanic):
885+class ManticTestInstallPanic(relbase.mantic, TestInstallPanic):
886 __test__ = True
887
888
889diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
890index fa33ec5..3215142 100644
891--- a/tests/vmtests/test_pollinate_useragent.py
892+++ b/tests/vmtests/test_pollinate_useragent.py
893@@ -65,11 +65,11 @@ class FocalTestPollinateUserAgent(relbase.focal, TestPollinateUserAgent):
894 __test__ = True
895
896
897-class HirsuteTestPollinateUserAgent(relbase.hirsute, TestPollinateUserAgent):
898+class JammyTestPollinateUserAgent(relbase.jammy, TestPollinateUserAgent):
899 __test__ = True
900
901
902-class ImpishTestPollinateUserAgent(relbase.impish, TestPollinateUserAgent):
903+class ManticTestPollinateUserAgent(relbase.mantic, TestPollinateUserAgent):
904 __test__ = True
905
906
907diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
908index 74fe29e..4fbf832 100644
909--- a/tests/vmtests/test_preserve.py
910+++ b/tests/vmtests/test_preserve.py
911@@ -29,11 +29,11 @@ class FocalTestPreserve(relbase.focal, TestPreserve):
912 __test__ = True
913
914
915-class HirsuteTestPreserve(relbase.hirsute, TestPreserve):
916+class JammyTestPreserve(relbase.jammy, TestPreserve):
917 __test__ = True
918
919
920-class ImpishTestPreserve(relbase.impish, TestPreserve):
921+class ManticTestPreserve(relbase.mantic, TestPreserve):
922 __test__ = True
923
924
925diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py
926index 46edd3f..23e4dee 100644
927--- a/tests/vmtests/test_preserve_bcache.py
928+++ b/tests/vmtests/test_preserve_bcache.py
929@@ -60,11 +60,11 @@ class FocalTestPreserveBcache(relbase.focal, TestPreserveBcache):
930 __test__ = True
931
932
933-class HirsuteTestPreserveBcache(relbase.hirsute, TestPreserveBcache):
934+class JammyTestPreserveBcache(relbase.jammy, TestPreserveBcache):
935 __test__ = True
936
937
938-class ImpishTestPreserveBcache(relbase.impish, TestPreserveBcache):
939+class ManticTestPreserveBcache(relbase.mantic, TestPreserveBcache):
940 __test__ = True
941
942
943diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py
944index 0c09c11..4b5401d 100644
945--- a/tests/vmtests/test_preserve_lvm.py
946+++ b/tests/vmtests/test_preserve_lvm.py
947@@ -73,11 +73,11 @@ class FocalTestLvmPreserve(relbase.focal, TestLvmPreserveAbs):
948 __test__ = True
949
950
951-class HirsuteTestLvmPreserve(relbase.hirsute, TestLvmPreserveAbs):
952+class JammyTestLvmPreserve(relbase.jammy, TestLvmPreserveAbs):
953 __test__ = True
954
955
956-class ImpishTestLvmPreserve(relbase.impish, TestLvmPreserveAbs):
957+class ManticTestLvmPreserve(relbase.mantic, TestLvmPreserveAbs):
958 __test__ = True
959
960
961diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py
962index 4db6c2b..e9759bf 100644
963--- a/tests/vmtests/test_preserve_partition_wipe_vg.py
964+++ b/tests/vmtests/test_preserve_partition_wipe_vg.py
965@@ -29,11 +29,11 @@ class FocalTestPreserveWipeLvm(relbase.focal, TestPreserveWipeLvm):
966 __test__ = True
967
968
969-class HirsuteTestPreserveWipeLvm(relbase.hirsute, TestPreserveWipeLvm):
970+class JammyTestPreserveWipeLvm(relbase.jammy, TestPreserveWipeLvm):
971 __test__ = True
972
973
974-class ImpishTestPreserveWipeLvm(relbase.impish, TestPreserveWipeLvm):
975+class ManticTestPreserveWipeLvm(relbase.mantic, TestPreserveWipeLvm):
976 __test__ = True
977
978
979@@ -56,13 +56,13 @@ class FocalTestPreserveWipeLvmSimple(relbase.focal, TestPreserveWipeLvmSimple):
980 __test__ = True
981
982
983-class HirsuteTestPreserveWipeLvmSimple(relbase.hirsute,
984- TestPreserveWipeLvmSimple):
985+class JammyTestPreserveWipeLvmSimple(relbase.jammy, TestPreserveWipeLvmSimple):
986 __test__ = True
987
988
989-class ImpishTestPreserveWipeLvmSimple(relbase.impish,
990- TestPreserveWipeLvmSimple):
991+class ManticTestPreserveWipeLvmSimple(
992+ relbase.mantic, TestPreserveWipeLvmSimple
993+):
994 __test__ = True
995
996
997diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
998index 04c16b7..7e42e7e 100644
999--- a/tests/vmtests/test_preserve_raid.py
1000+++ b/tests/vmtests/test_preserve_raid.py
1001@@ -29,11 +29,11 @@ class FocalTestPreserveRAID(relbase.focal, TestPreserveRAID):
1002 __test__ = True
1003
1004
1005-class HirsuteTestPreserveRAID(relbase.hirsute, TestPreserveRAID):
1006+class JammyTestPreserveRAID(relbase.jammy, TestPreserveRAID):
1007 __test__ = True
1008
1009
1010-class ImpishTestPreserveRAID(relbase.impish, TestPreserveRAID):
1011+class ManticTestPreserveRAID(relbase.mantic, TestPreserveRAID):
1012 __test__ = True
1013
1014
1015@@ -65,13 +65,13 @@ class FocalTestPartitionExistingRAID(
1016 __test__ = True
1017
1018
1019-class HirsuteTestPartitionExistingRAID(
1020- relbase.hirsute, TestPartitionExistingRAID):
1021+class JammyTestPartitionExistingRAID(
1022+ relbase.jammy, TestPartitionExistingRAID):
1023 __test__ = True
1024
1025
1026-class ImpishTestPartitionExistingRAID(
1027- relbase.impish, TestPartitionExistingRAID):
1028+class ManticTestPartitionExistingRAID(
1029+ relbase.mantic, TestPartitionExistingRAID):
1030 __test__ = True
1031
1032
1033diff --git a/tests/vmtests/test_python_apt.py b/tests/vmtests/test_python_apt.py
1034index 4162608..1542275 100644
1035--- a/tests/vmtests/test_python_apt.py
1036+++ b/tests/vmtests/test_python_apt.py
1037@@ -31,11 +31,11 @@ class FocalTestPythonApt(relbase.focal, TestPythonApt):
1038 __test__ = True
1039
1040
1041-class HirsuteTestPythonApt(relbase.hirsute, TestPythonApt):
1042+class JammyTestPythonApt(relbase.jammy, TestPythonApt):
1043 __test__ = True
1044
1045
1046-class ImpishTestPythonApt(relbase.impish, TestPythonApt):
1047+class ManticTestPythonApt(relbase.mantic, TestPythonApt):
1048 __test__ = True
1049
1050
1051diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
1052index e682f34..53f55cc 100644
1053--- a/tests/vmtests/test_raid5_bcache.py
1054+++ b/tests/vmtests/test_raid5_bcache.py
1055@@ -92,11 +92,11 @@ class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs):
1056 __test__ = True
1057
1058
1059-class HirsuteTestRaid5Bcache(relbase.hirsute, TestMdadmBcacheAbs):
1060+class JammyTestRaid5Bcache(relbase.jammy, TestMdadmBcacheAbs):
1061 __test__ = True
1062
1063
1064-class ImpishTestRaid5Bcache(relbase.impish, TestMdadmBcacheAbs):
1065+class ManticTestRaid5Bcache(relbase.mantic, TestMdadmBcacheAbs):
1066 __test__ = True
1067
1068
1069diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py
1070index a2bd1be..7a18abe 100644
1071--- a/tests/vmtests/test_raid_partition_to_disk.py
1072+++ b/tests/vmtests/test_raid_partition_to_disk.py
1073@@ -22,11 +22,11 @@ class FocalTestRAIDPartitionToDisk(relbase.focal, TestRAIDPartitionToDisk):
1074 __test__ = True
1075
1076
1077-class HirsuteTestRAIDPartitionToDisk(relbase.hirsute, TestRAIDPartitionToDisk):
1078+class JammyTestRAIDPartitionToDisk(relbase.jammy, TestRAIDPartitionToDisk):
1079 __test__ = True
1080
1081
1082-class ImpishTestRAIDPartitionToDisk(relbase.impish, TestRAIDPartitionToDisk):
1083+class ManticTestRAIDPartitionToDisk(relbase.mantic, TestRAIDPartitionToDisk):
1084 __test__ = True
1085
1086
1087diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py
1088index 81c0cb0..e22598e 100644
1089--- a/tests/vmtests/test_reuse_lvm_member.py
1090+++ b/tests/vmtests/test_reuse_lvm_member.py
1091@@ -26,12 +26,12 @@ class FocalTestReuseLVMMemberPartition(relbase.focal,
1092 __test__ = True
1093
1094
1095-class HirsuteTestReuseLVMMemberPartition(relbase.hirsute,
1096- TestReuseLVMMemberPartition):
1097+class JammyTestReuseLVMMemberPartition(relbase.jammy,
1098+ TestReuseLVMMemberPartition):
1099 __test__ = True
1100
1101
1102-class ImpishTestReuseLVMMemberPartition(relbase.impish,
1103+class ManticTestReuseLVMMemberPartition(relbase.mantic,
1104 TestReuseLVMMemberPartition):
1105 __test__ = True
1106
1107diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py
1108index ed52f5b..562db39 100644
1109--- a/tests/vmtests/test_reuse_msdos_partitions.py
1110+++ b/tests/vmtests/test_reuse_msdos_partitions.py
1111@@ -23,12 +23,12 @@ class FocalTestReuseMSDOSPartitions(relbase.focal,
1112 __test__ = True
1113
1114
1115-class HirsuteTestReuseMSDOSPartitions(relbase.hirsute,
1116- TestReuseMSDOSPartitions):
1117+class JammyTestReuseMSDOSPartitions(relbase.jammy,
1118+ TestReuseMSDOSPartitions):
1119 __test__ = True
1120
1121
1122-class ImpishTestReuseMSDOSPartitions(relbase.impish,
1123+class ManticTestReuseMSDOSPartitions(relbase.mantic,
1124 TestReuseMSDOSPartitions):
1125 __test__ = True
1126
1127diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py
1128index 7611140..7eb96b4 100644
1129--- a/tests/vmtests/test_reuse_raid_member.py
1130+++ b/tests/vmtests/test_reuse_raid_member.py
1131@@ -32,11 +32,11 @@ class FocalTestReuseRAIDMember(relbase.focal, TestReuseRAIDMember):
1132 __test__ = True
1133
1134
1135-class HirsuteTestReuseRAIDMember(relbase.hirsute, TestReuseRAIDMember):
1136+class JammyTestReuseRAIDMember(relbase.jammy, TestReuseRAIDMember):
1137 __test__ = True
1138
1139
1140-class ImpishTestReuseRAIDMember(relbase.impish, TestReuseRAIDMember):
1141+class ManticTestReuseRAIDMember(relbase.mantic, TestReuseRAIDMember):
1142 __test__ = True
1143
1144
1145@@ -50,12 +50,12 @@ class FocalTestReuseRAIDMemberPartition(relbase.focal,
1146 __test__ = True
1147
1148
1149-class HirsuteTestReuseRAIDMemberPartition(relbase.hirsute,
1150- TestReuseRAIDMemberPartition):
1151+class JammyTestReuseRAIDMemberPartition(relbase.jammy,
1152+ TestReuseRAIDMemberPartition):
1153 __test__ = True
1154
1155
1156-class ImpishTestReuseRAIDMemberPartition(relbase.impish,
1157+class ManticTestReuseRAIDMemberPartition(relbase.mantic,
1158 TestReuseRAIDMemberPartition):
1159 __test__ = True
1160
1161diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
1162index c11749e..f2207b5 100644
1163--- a/tests/vmtests/test_reuse_uefi_esp.py
1164+++ b/tests/vmtests/test_reuse_uefi_esp.py
1165@@ -41,14 +41,14 @@ class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs):
1166 return super().test_efiboot_menu_has_one_distro_entry()
1167
1168
1169-class HirsuteTestUefiReuseEsp(relbase.hirsute, TestUefiReuseEspAbs):
1170+class JammyTestUefiReuseEsp(relbase.jammy, TestUefiReuseEspAbs):
1171 __test__ = True
1172
1173 def test_efiboot_menu_has_one_distro_entry(self):
1174 return super().test_efiboot_menu_has_one_distro_entry()
1175
1176
1177-class ImpishTestUefiReuseEsp(relbase.impish, TestUefiReuseEspAbs):
1178+class ManticTestUefiReuseEsp(relbase.mantic, TestUefiReuseEspAbs):
1179 __test__ = True
1180
1181 def test_efiboot_menu_has_one_distro_entry(self):
1182diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
1183index 2b91f0b..be87f72 100644
1184--- a/tests/vmtests/test_simple.py
1185+++ b/tests/vmtests/test_simple.py
1186@@ -47,14 +47,14 @@ class FocalTestSimple(relbase.focal, TestSimple):
1187 self.output_files_exist(["netplan.yaml"])
1188
1189
1190-class HirsuteTestSimple(relbase.hirsute, TestSimple):
1191+class JammyTestSimple(relbase.jammy, TestSimple):
1192 __test__ = True
1193
1194 def test_output_files_exist(self):
1195 self.output_files_exist(["netplan.yaml"])
1196
1197
1198-class ImpishTestSimple(relbase.impish, TestSimple):
1199+class ManticTestSimple(relbase.mantic, TestSimple):
1200 __test__ = True
1201
1202 def test_output_files_exist(self):
1203@@ -110,14 +110,14 @@ class FocalTestSimpleStorage(relbase.focal, TestSimpleStorage):
1204 self.output_files_exist(["netplan.yaml"])
1205
1206
1207-class HirsuteTestSimpleStorage(relbase.hirsute, TestSimpleStorage):
1208+class JammyTestSimpleStorage(relbase.jammy, TestSimpleStorage):
1209 __test__ = True
1210
1211 def test_output_files_exist(self):
1212 self.output_files_exist(["netplan.yaml"])
1213
1214
1215-class ImpishTestSimpleStorage(relbase.impish, TestSimpleStorage):
1216+class ManticTestSimpleStorage(relbase.mantic, TestSimpleStorage):
1217 __test__ = True
1218
1219 def test_output_files_exist(self):
1220@@ -150,14 +150,14 @@ class FocalTestGrubNoDefaults(relbase.focal, TestGrubNoDefaults):
1221 self.output_files_exist(["netplan.yaml"])
1222
1223
1224-class HirsuteTestGrubNoDefaults(relbase.hirsute, TestGrubNoDefaults):
1225+class JammyTestGrubNoDefaults(relbase.jammy, TestGrubNoDefaults):
1226 __test__ = True
1227
1228 def test_output_files_exist(self):
1229 self.output_files_exist(["netplan.yaml"])
1230
1231
1232-class ImpishTestGrubNoDefaults(relbase.impish, TestGrubNoDefaults):
1233+class ManticTestGrubNoDefaults(relbase.mantic, TestGrubNoDefaults):
1234 __test__ = True
1235
1236 def test_output_files_exist(self):
1237diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
1238index 1a90a7d..1eeae61 100644
1239--- a/tests/vmtests/test_uefi_basic.py
1240+++ b/tests/vmtests/test_uefi_basic.py
1241@@ -100,11 +100,11 @@ class FocalUefiTestBasic(relbase.focal, TestBasicAbs):
1242 __test__ = True
1243
1244
1245-class HirsuteUefiTestBasic(relbase.hirsute, TestBasicAbs):
1246+class JammyUefiTestBasic(relbase.jammy, TestBasicAbs):
1247 __test__ = True
1248
1249
1250-class ImpishUefiTestBasic(relbase.impish, TestBasicAbs):
1251+class ManticUefiTestBasic(relbase.mantic, TestBasicAbs):
1252 __test__ = True
1253
1254
1255@@ -128,12 +128,12 @@ class FocalUefiTestBasic4k(relbase.focal, TestBasicAbs):
1256 disk_block_size = 4096
1257
1258
1259-class HirsuteUefiTestBasic4k(relbase.hirsute, TestBasicAbs):
1260+class JammyUefiTestBasic4k(relbase.jammy, TestBasicAbs):
1261 __test__ = True
1262 disk_block_size = 4096
1263
1264
1265-class ImpishUefiTestBasic4k(relbase.impish, TestBasicAbs):
1266+class ManticUefiTestBasic4k(relbase.mantic, TestBasicAbs):
1267 __test__ = True
1268 disk_block_size = 4096
1269
1270diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
1271index 0e310c6..1bb8fd3 100644
1272--- a/tests/vmtests/test_zfsroot.py
1273+++ b/tests/vmtests/test_zfsroot.py
1274@@ -101,12 +101,12 @@ class FocalTestZfsRoot(relbase.focal, TestZfsRootAbs):
1275 mem = 4096
1276
1277
1278-class HirsuteTestZfsRoot(relbase.hirsute, TestZfsRootAbs):
1279+class JammyTestZfsRoot(relbase.jammy, TestZfsRootAbs):
1280 __test__ = True
1281 mem = 4096
1282
1283
1284-class ImpishTestZfsRoot(relbase.impish, TestZfsRootAbs):
1285+class ManticTestZfsRoot(relbase.mantic, TestZfsRootAbs):
1286 __test__ = True
1287 mem = 4096
1288
1289@@ -135,12 +135,12 @@ class FocalTestZfsRootFsType(relbase.focal, TestZfsRootFsTypeAbs):
1290 mem = 4096
1291
1292
1293-class HirsuteTestZfsRootFsType(relbase.hirsute, TestZfsRootFsTypeAbs):
1294+class JammyTestZfsRootFsType(relbase.jammy, TestZfsRootFsTypeAbs):
1295 __test__ = True
1296 mem = 4096
1297
1298
1299-class ImpishTestZfsRootFsType(relbase.impish, TestZfsRootFsTypeAbs):
1300+class ManticTestZfsRootFsType(relbase.mantic, TestZfsRootFsTypeAbs):
1301 __test__ = True
1302 mem = 4096
1303
1304diff --git a/tools/vmtest-system-setup b/tools/vmtest-system-setup
1305index e53118e..5172741 100755
1306--- a/tools/vmtest-system-setup
1307+++ b/tools/vmtest-system-setup
1308@@ -21,6 +21,7 @@ DEPS=(
1309 python3-apt
1310 python3-attr
1311 python3-coverage
1312+ python3-debian
1313 python3-jsonschema
1314 python3-nose
1315 python3-oauthlib

Subscribers

People subscribed via source and target branches