curtin

Merge ~mwhudson/curtin:bye-groovy-hello-impish into curtin:master

  1. Git
  2. lp:~mwhudson/curtin
  3. bye-groovy-hello-impish
  4. Merge into master
Proposed by Michael Hudson-Doyle
Status: Rejected
Rejected by: Michael Hudson-Doyle
Proposed branch: ~mwhudson/curtin:bye-groovy-hello-impish
Merge into: curtin:master
Diff against target: 876 lines (+83/-85)
49 files modified
tests/vmtests/releases.py (+8/-8)
tests/vmtests/test_apt_config_cmd.py (+1/-1)
tests/vmtests/test_basic.py (+2/-2)
tests/vmtests/test_basic_dasd.py (+1/-1)
tests/vmtests/test_bcache_basic.py (+1/-1)
tests/vmtests/test_bcache_bug1718699.py (+1/-1)
tests/vmtests/test_bcache_ceph.py (+2/-2)
tests/vmtests/test_bcache_partitions.py (+1/-1)
tests/vmtests/test_fs_battery.py (+1/-1)
tests/vmtests/test_iscsi.py (+1/-1)
tests/vmtests/test_journald_reporter.py (+1/-1)
tests/vmtests/test_lvm.py (+1/-1)
tests/vmtests/test_lvm_iscsi.py (+1/-1)
tests/vmtests/test_lvm_raid.py (+1/-1)
tests/vmtests/test_lvm_root.py (+2/-2)
tests/vmtests/test_mdadm_bcache.py (+8/-8)
tests/vmtests/test_mdadm_iscsi.py (+1/-1)
tests/vmtests/test_multipath.py (+2/-2)
tests/vmtests/test_multipath_lvm.py (+2/-2)
tests/vmtests/test_network.py (+1/-1)
tests/vmtests/test_network_alias.py (+1/-1)
tests/vmtests/test_network_bonding.py (+1/-1)
tests/vmtests/test_network_bridging.py (+1/-1)
tests/vmtests/test_network_disabled.py (+3/-3)
tests/vmtests/test_network_ipv6.py (+0/-4)
tests/vmtests/test_network_ipv6_static.py (+1/-1)
tests/vmtests/test_network_ipv6_vlan.py (+1/-1)
tests/vmtests/test_network_mtu.py (+1/-1)
tests/vmtests/test_network_ovs.py (+2/-1)
tests/vmtests/test_network_static.py (+1/-1)
tests/vmtests/test_network_static_routes.py (+1/-1)
tests/vmtests/test_network_vlan.py (+4/-1)
tests/vmtests/test_nvme.py (+1/-5)
tests/vmtests/test_panic.py (+1/-1)
tests/vmtests/test_pollinate_useragent.py (+1/-1)
tests/vmtests/test_preserve.py (+1/-1)
tests/vmtests/test_preserve_bcache.py (+1/-1)
tests/vmtests/test_preserve_lvm.py (+1/-1)
tests/vmtests/test_preserve_partition_wipe_vg.py (+2/-2)
tests/vmtests/test_preserve_raid.py (+3/-3)
tests/vmtests/test_raid5_bcache.py (+1/-1)
tests/vmtests/test_raid_partition_to_disk.py (+1/-1)
tests/vmtests/test_reuse_lvm_member.py (+1/-1)
tests/vmtests/test_reuse_msdos_partitions.py (+1/-1)
tests/vmtests/test_reuse_raid_member.py (+2/-2)
tests/vmtests/test_reuse_uefi_esp.py (+1/-1)
tests/vmtests/test_simple.py (+3/-3)
tests/vmtests/test_uefi_basic.py (+2/-2)
tests/vmtests/test_zfsroot.py (+4/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
curtin developers Pending
Review via email: mp+406432@code.launchpad.net

Commit message

remove groovy and add impish to the vmtests

using tools/vmtest-add-relase, tools/vmtest-remove-release

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

FAILED: Continuous integration, rev:a13adc0554d866e56517e7ee7ebecf4727b6590a
https://jenkins.ubuntu.com/server/job/curtin-ci/143/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/143/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/143/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/143/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/143/

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

review: Needs Fixing (continuous-integration)
~mwhudson/curtin:bye-groovy-hello-impish updated
37ecd32... by Michael Hudson-Doyle

update tests/vmtests/release.py

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

FAILED: Continuous integration, rev:37ecd32922a6bf29594d93547ebd1a447257435e
https://jenkins.ubuntu.com/server/job/curtin-ci/144/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/144/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/144/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/144/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/144/

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

review: Needs Fixing (continuous-integration)
~mwhudson/curtin:bye-groovy-hello-impish updated
0b1924d... by Michael Hudson-Doyle

fix flakes

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

PASSED: Continuous integration, rev:0b1924de9ab6b1eb47bb665b0df28a995587c463
https://jenkins.ubuntu.com/server/job/curtin-ci/145/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/145/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/145/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/145/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/145/

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

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

Dan did this better.

Unmerged commits

0b1924d... by Michael Hudson-Doyle

fix flakes

37ecd32... by Michael Hudson-Doyle

update tests/vmtests/release.py

a13adc0... by Michael Hudson-Doyle

remove groovy and add impish to the vmtests

using tools/vmtest-add-relase, tools/vmtest-remove-release

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 35b069b..31c4827 100644
3--- a/tests/vmtests/releases.py
4+++ b/tests/vmtests/releases.py
5@@ -185,20 +185,20 @@ class _FocalBase(_UbuntuBase):
6 subarch = "ga-20.04"
7
8
9-class _GroovyBase(_UbuntuBase):
10- release = "groovy"
11- target_release = "groovy"
12+class _HirsuteBase(_UbuntuBase):
13+ release = "hirsute"
14+ target_release = "hirsute"
15 mem = "2048"
16 if _UbuntuBase.arch == "arm64":
17 subarch = "ga-20.10"
18
19
20-class _HirsuteBase(_UbuntuBase):
21- release = "hirsute"
22- target_release = "hirsute"
23+class _ImpishBase(_UbuntuBase):
24+ release = "impish"
25+ target_release = "impish"
26 mem = "2048"
27 if _UbuntuBase.arch == "arm64":
28- subarch = "ga-20.10"
29+ subarch = "ga-21.10"
30
31
32 class _Releases(object):
33@@ -219,8 +219,8 @@ class _Releases(object):
34 disco = _DiscoBase
35 eoan = _EoanBase
36 focal = _FocalBase
37- groovy = _GroovyBase
38 hirsute = _HirsuteBase
39+ impish = _ImpishBase
40
41
42 class _CentosReleases(object):
43diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
44index a95612c..2fdd971 100644
45--- a/tests/vmtests/test_apt_config_cmd.py
46+++ b/tests/vmtests/test_apt_config_cmd.py
47@@ -72,7 +72,7 @@ class HirsuteTestAptConfigCMDCMD(relbase.hirsute, TestAptConfigCMD):
48 __test__ = True
49
50
51-class GroovyTestAptConfigCMDCMD(relbase.groovy, TestAptConfigCMD):
52+class ImpishTestAptConfigCMDCMD(relbase.impish, TestAptConfigCMD):
53 __test__ = True
54
55
56diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
57index 06f1f59..6059bd9 100644
58--- a/tests/vmtests/test_basic.py
59+++ b/tests/vmtests/test_basic.py
60@@ -263,7 +263,7 @@ class HirsuteTestBasic(relbase.hirsute, TestBasicAbs):
61 __test__ = True
62
63
64-class GroovyTestBasic(relbase.groovy, TestBasicAbs):
65+class ImpishTestBasic(relbase.impish, TestBasicAbs):
66 __test__ = True
67
68
69@@ -387,7 +387,7 @@ class HirsuteTestScsiBasic(relbase.hirsute, TestBasicScsiAbs):
70 __test__ = True
71
72
73-class GroovyTestScsiBasic(relbase.groovy, TestBasicScsiAbs):
74+class ImpishTestScsiBasic(relbase.impish, TestBasicScsiAbs):
75 __test__ = True
76
77
78diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py
79index 49957b8..0aa35fd 100644
80--- a/tests/vmtests/test_basic_dasd.py
81+++ b/tests/vmtests/test_basic_dasd.py
82@@ -60,7 +60,7 @@ class HirsuteTestBasicDasd(relbase.hirsute, TestBasicDasd):
83 __test__ = True
84
85
86-class GroovyTestBasicDasd(relbase.groovy, TestBasicDasd):
87+class ImpishTestBasicDasd(relbase.impish, TestBasicDasd):
88 __test__ = True
89
90
91diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
92index e9ec1ea..490ae4c 100644
93--- a/tests/vmtests/test_bcache_basic.py
94+++ b/tests/vmtests/test_bcache_basic.py
95@@ -72,7 +72,7 @@ class HirsuteBcacheBasic(relbase.hirsute, TestBcacheBasic):
96 __test__ = True
97
98
99-class GroovyBcacheBasic(relbase.groovy, TestBcacheBasic):
100+class ImpishBcacheBasic(relbase.impish, TestBcacheBasic):
101 __test__ = True
102
103
104diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
105index a43ec0f..3b19c41 100644
106--- a/tests/vmtests/test_bcache_bug1718699.py
107+++ b/tests/vmtests/test_bcache_bug1718699.py
108@@ -27,7 +27,7 @@ class HirsuteTestBcacheBug1718699(relbase.hirsute, TestBcacheBug1718699):
109 __test__ = True
110
111
112-class GroovyTestBcacheBug1718699(relbase.groovy, TestBcacheBug1718699):
113+class ImpishTestBcacheBug1718699(relbase.impish, TestBcacheBug1718699):
114 __test__ = True
115
116
117diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py
118index 53e050c..713ade9 100644
119--- a/tests/vmtests/test_bcache_ceph.py
120+++ b/tests/vmtests/test_bcache_ceph.py
121@@ -83,7 +83,7 @@ class HirsuteTestBcacheCeph(relbase.hirsute, TestBcacheCeph):
122 __test__ = True
123
124
125-class GroovyTestBcacheCeph(relbase.groovy, TestBcacheCeph):
126+class ImpishTestBcacheCeph(relbase.impish, TestBcacheCeph):
127 __test__ = True
128
129
130@@ -117,7 +117,7 @@ class HirsuteTestBcacheCephLvm(relbase.hirsute, TestBcacheCephLvm):
131 __test__ = True
132
133
134-class GroovyTestBcacheCephLvm(relbase.groovy, TestBcacheCephLvm):
135+class ImpishTestBcacheCephLvm(relbase.impish, TestBcacheCephLvm):
136 __test__ = True
137
138
139diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py
140index a69d2ef..6268fd5 100644
141--- a/tests/vmtests/test_bcache_partitions.py
142+++ b/tests/vmtests/test_bcache_partitions.py
143@@ -33,7 +33,7 @@ class HirsuteTestBcachePartitions(relbase.hirsute, TestBcachePartitions):
144 __test__ = True
145
146
147-class GroovyTestBcachePartitions(relbase.groovy, TestBcachePartitions):
148+class ImpishTestBcachePartitions(relbase.impish, TestBcachePartitions):
149 __test__ = True
150
151
152diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
153index cc39f4a..7d70f9c 100644
154--- a/tests/vmtests/test_fs_battery.py
155+++ b/tests/vmtests/test_fs_battery.py
156@@ -247,7 +247,7 @@ class HirsuteTestFsBattery(relbase.hirsute, TestFsBattery):
157 __test__ = True
158
159
160-class GroovyTestFsBattery(relbase.groovy, TestFsBattery):
161+class ImpishTestFsBattery(relbase.impish, TestFsBattery):
162 __test__ = True
163
164
165diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
166index c46ac30..2fd9866 100644
167--- a/tests/vmtests/test_iscsi.py
168+++ b/tests/vmtests/test_iscsi.py
169@@ -80,7 +80,7 @@ class HirsuteTestIscsiBasic(relbase.hirsute, TestBasicIscsiAbs):
170 __test__ = True
171
172
173-class GroovyTestIscsiBasic(relbase.groovy, TestBasicIscsiAbs):
174+class ImpishTestIscsiBasic(relbase.impish, TestBasicIscsiAbs):
175 __test__ = True
176
177
178diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
179index 3979aa7..064d71a 100644
180--- a/tests/vmtests/test_journald_reporter.py
181+++ b/tests/vmtests/test_journald_reporter.py
182@@ -40,7 +40,7 @@ class HirsuteTestJournaldReporter(relbase.hirsute, TestJournaldReporter):
183 __test__ = True
184
185
186-class GroovyTestJournaldReporter(relbase.groovy, TestJournaldReporter):
187+class ImpishTestJournaldReporter(relbase.impish, TestJournaldReporter):
188 __test__ = True
189
190
191diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
192index d169eeb..a0ce90d 100644
193--- a/tests/vmtests/test_lvm.py
194+++ b/tests/vmtests/test_lvm.py
195@@ -85,7 +85,7 @@ class HirsuteTestLvm(relbase.hirsute, TestLvmAbs):
196 __test__ = True
197
198
199-class GroovyTestLvm(relbase.groovy, TestLvmAbs):
200+class ImpishTestLvm(relbase.impish, TestLvmAbs):
201 __test__ = True
202
203
204diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
205index 0cf020e..463d863 100644
206--- a/tests/vmtests/test_lvm_iscsi.py
207+++ b/tests/vmtests/test_lvm_iscsi.py
208@@ -103,7 +103,7 @@ class HirsuteTestIscsiLvm(relbase.hirsute, TestLvmIscsiAbs):
209 __test__ = True
210
211
212-class GroovyTestIscsiLvm(relbase.groovy, TestLvmIscsiAbs):
213+class ImpishTestIscsiLvm(relbase.impish, TestLvmIscsiAbs):
214 __test__ = True
215
216
217diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
218index 3fe71a9..650fc25 100644
219--- a/tests/vmtests/test_lvm_raid.py
220+++ b/tests/vmtests/test_lvm_raid.py
221@@ -63,5 +63,5 @@ class HirsuteTestLvmOverRaid(relbase.hirsute, TestLvmOverRaidAbs):
222 __test__ = True
223
224
225-class GroovyTestLvmOverRaid(relbase.groovy, TestLvmOverRaidAbs):
226+class ImpishTestLvmOverRaid(relbase.impish, TestLvmOverRaidAbs):
227 __test__ = True
228diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
229index c910160..bc09e8d 100644
230--- a/tests/vmtests/test_lvm_root.py
231+++ b/tests/vmtests/test_lvm_root.py
232@@ -101,7 +101,7 @@ class HirsuteTestLvmRootExt4(relbase.hirsute, TestLvmRootAbs):
233 }
234
235
236-class GroovyTestLvmRootExt4(relbase.groovy, TestLvmRootAbs):
237+class ImpishTestLvmRootExt4(relbase.impish, TestLvmRootAbs):
238 __test__ = True
239 conf_replace = {
240 '__ROOTFS_FORMAT__': 'ext4',
241@@ -162,7 +162,7 @@ class HirsuteTestUefiLvmRootExt4(relbase.hirsute, TestUefiLvmRootAbs):
242 }
243
244
245-class GroovyTestUefiLvmRootExt4(relbase.groovy, TestUefiLvmRootAbs):
246+class ImpishTestUefiLvmRootExt4(relbase.impish, TestUefiLvmRootAbs):
247 __test__ = True
248 conf_replace = {
249 '__BOOTFS_FORMAT__': 'ext4',
250diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
251index 62f25e7..d90f478 100644
252--- a/tests/vmtests/test_mdadm_bcache.py
253+++ b/tests/vmtests/test_mdadm_bcache.py
254@@ -162,7 +162,7 @@ class HirsuteTestMdadmBcache(relbase.hirsute, TestMdadmBcacheAbs):
255 __test__ = True
256
257
258-class GroovyTestMdadmBcache(relbase.groovy, TestMdadmBcacheAbs):
259+class ImpishTestMdadmBcache(relbase.impish, TestMdadmBcacheAbs):
260 __test__ = True
261
262
263@@ -211,7 +211,7 @@ class HirsuteTestMirrorboot(relbase.hirsute, TestMirrorbootAbs):
264 __test__ = True
265
266
267-class GroovyTestMirrorboot(relbase.groovy, TestMirrorbootAbs):
268+class ImpishTestMirrorboot(relbase.impish, TestMirrorbootAbs):
269 __test__ = True
270
271
272@@ -265,7 +265,7 @@ class HirsuteTestMirrorbootPartitions(relbase.hirsute,
273 __test__ = True
274
275
276-class GroovyTestMirrorbootPartitions(relbase.groovy,
277+class ImpishTestMirrorbootPartitions(relbase.impish,
278 TestMirrorbootPartitionsAbs):
279 __test__ = True
280
281@@ -365,7 +365,7 @@ class HirsuteTestMirrorbootPartitionsUEFI(relbase.hirsute,
282 __test__ = True
283
284
285-class GroovyTestMirrorbootPartitionsUEFI(relbase.groovy,
286+class ImpishTestMirrorbootPartitionsUEFI(relbase.impish,
287 TestMirrorbootPartitionsUEFIAbs):
288 __test__ = True
289
290@@ -418,7 +418,7 @@ class HirsuteTestRaid5boot(relbase.hirsute, TestRaid5bootAbs):
291 __test__ = True
292
293
294-class GroovyTestRaid5boot(relbase.groovy, TestRaid5bootAbs):
295+class ImpishTestRaid5boot(relbase.impish, TestRaid5bootAbs):
296 __test__ = True
297
298
299@@ -483,7 +483,7 @@ class HirsuteTestRaid6boot(relbase.hirsute, TestRaid6bootAbs):
300 __test__ = True
301
302
303-class GroovyTestRaid6boot(relbase.groovy, TestRaid6bootAbs):
304+class ImpishTestRaid6boot(relbase.impish, TestRaid6bootAbs):
305 __test__ = True
306
307
308@@ -534,7 +534,7 @@ class HirsuteTestRaid10boot(relbase.hirsute, TestRaid10bootAbs):
309 __test__ = True
310
311
312-class GroovyTestRaid10boot(relbase.groovy, TestRaid10bootAbs):
313+class ImpishTestRaid10boot(relbase.impish, TestRaid10bootAbs):
314 __test__ = True
315
316
317@@ -642,7 +642,7 @@ class HirsuteTestAllindata(relbase.hirsute, TestAllindataAbs):
318 __test__ = True
319
320
321-class GroovyTestAllindata(relbase.groovy, TestAllindataAbs):
322+class ImpishTestAllindata(relbase.impish, TestAllindataAbs):
323 __test__ = True
324
325
326diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
327index 6ad6b72..f6f0b22 100644
328--- a/tests/vmtests/test_mdadm_iscsi.py
329+++ b/tests/vmtests/test_mdadm_iscsi.py
330@@ -58,7 +58,7 @@ class HirsuteTestIscsiMdadm(relbase.hirsute, TestMdadmIscsiAbs):
331 __test__ = True
332
333
334-class GroovyTestIscsiMdadm(relbase.groovy, TestMdadmIscsiAbs):
335+class ImpishTestIscsiMdadm(relbase.impish, TestMdadmIscsiAbs):
336 __test__ = True
337
338
339diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
340index 163b73a..ac85a58 100644
341--- a/tests/vmtests/test_multipath.py
342+++ b/tests/vmtests/test_multipath.py
343@@ -166,7 +166,7 @@ class HirsuteTestMultipathBasic(relbase.hirsute, TestMultipathBasicAbs):
344 __test__ = True
345
346
347-class GroovyTestMultipathBasic(relbase.groovy, TestMultipathBasicAbs):
348+class ImpishTestMultipathBasic(relbase.impish, TestMultipathBasicAbs):
349 __test__ = True
350
351
352@@ -182,7 +182,7 @@ class HirsuteTestMultipathReuse(relbase.hirsute, TestMultipathReuseAbs):
353 __test__ = True
354
355
356-class GroovyTestMultipathReuse(relbase.groovy, TestMultipathReuseAbs):
357+class ImpishTestMultipathReuse(relbase.impish, TestMultipathReuseAbs):
358 __test__ = True
359
360
361diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py
362index f5f5537..97d797e 100644
363--- a/tests/vmtests/test_multipath_lvm.py
364+++ b/tests/vmtests/test_multipath_lvm.py
365@@ -64,7 +64,7 @@ class HirsuteTestMultipathLvm(relbase.hirsute, TestMultipathLvmAbs):
366 __test__ = True
367
368
369-class GroovyTestMultipathLvm(relbase.groovy, TestMultipathLvmAbs):
370+class ImpishTestMultipathLvm(relbase.impish, TestMultipathLvmAbs):
371 __test__ = True
372
373
374@@ -82,7 +82,7 @@ class HirsuteTestMultipathLvmPartWipe(relbase.hirsute,
375 __test__ = True
376
377
378-class GroovyTestMultipathLvmPartWipe(relbase.groovy,
379+class ImpishTestMultipathLvmPartWipe(relbase.impish,
380 TestMultipathLvmPartWipeAbs):
381 __test__ = True
382
383diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
384index db16bd4..1b42493 100644
385--- a/tests/vmtests/test_network.py
386+++ b/tests/vmtests/test_network.py
387@@ -482,7 +482,7 @@ class HirsuteTestNetworkBasic(relbase.hirsute, TestNetworkBasicAbs):
388 __test__ = True
389
390
391-class GroovyTestNetworkBasic(relbase.groovy, TestNetworkBasicAbs):
392+class ImpishTestNetworkBasic(relbase.impish, TestNetworkBasicAbs):
393 __test__ = True
394
395
396diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
397index 9f460fa..8b58edd 100644
398--- a/tests/vmtests/test_network_alias.py
399+++ b/tests/vmtests/test_network_alias.py
400@@ -60,7 +60,7 @@ class HirsuteTestNetworkAlias(relbase.hirsute, TestNetworkAliasAbs):
401 __test__ = True
402
403
404-class GroovyTestNetworkAlias(relbase.groovy, TestNetworkAliasAbs):
405+class ImpishTestNetworkAlias(relbase.impish, TestNetworkAliasAbs):
406 __test__ = True
407
408
409diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
410index f58065d..73bcf60 100644
411--- a/tests/vmtests/test_network_bonding.py
412+++ b/tests/vmtests/test_network_bonding.py
413@@ -65,7 +65,7 @@ class HirsuteTestBonding(relbase.hirsute, TestNetworkBondingAbs):
414 __test__ = True
415
416
417-class GroovyTestBonding(relbase.groovy, TestNetworkBondingAbs):
418+class ImpishTestBonding(relbase.impish, TestNetworkBondingAbs):
419 __test__ = True
420
421
422diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
423index b0d5962..93ecc4b 100644
424--- a/tests/vmtests/test_network_bridging.py
425+++ b/tests/vmtests/test_network_bridging.py
426@@ -244,7 +244,7 @@ class HirsuteTestBridging(relbase.hirsute, TestBridgeNetworkAbs):
427 __test__ = True
428
429
430-class GroovyTestBridging(relbase.groovy, TestBridgeNetworkAbs):
431+class ImpishTestBridging(relbase.impish, TestBridgeNetworkAbs):
432 __test__ = True
433
434
435diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py
436index 9079f8e..d56ebde 100644
437--- a/tests/vmtests/test_network_disabled.py
438+++ b/tests/vmtests/test_network_disabled.py
439@@ -67,7 +67,7 @@ class HirsuteCurtinDisableNetworkRendering(relbase.hirsute, TestKlass1):
440 __test__ = True
441
442
443-class GroovyCurtinDisableNetworkRendering(relbase.groovy, TestKlass1):
444+class ImpishCurtinDisableNetworkRendering(relbase.impish, TestKlass1):
445 __test__ = True
446
447
448@@ -79,7 +79,7 @@ class HirsuteCurtinDisableCloudInitNetworking(relbase.hirsute, TestKlass2):
449 __test__ = True
450
451
452-class GroovyCurtinDisableCloudInitNetworking(relbase.groovy, TestKlass2):
453+class ImpishCurtinDisableCloudInitNetworking(relbase.impish, TestKlass2):
454 __test__ = True
455
456
457@@ -92,7 +92,7 @@ class HirsuteCurtinDisableCloudInitNetworkingVersion1(relbase.hirsute,
458 __test__ = True
459
460
461-class GroovyCurtinDisableCloudInitNetworkingVersion1(relbase.groovy,
462+class ImpishCurtinDisableCloudInitNetworkingVersion1(relbase.impish,
463 TestKlass3):
464 __test__ = True
465
466diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
467index d76d295..7802855 100644
468--- a/tests/vmtests/test_network_ipv6.py
469+++ b/tests/vmtests/test_network_ipv6.py
470@@ -53,10 +53,6 @@ class BionicTestNetworkIPV6(relbase.bionic, TestNetworkIPV6Abs):
471 __test__ = True
472
473
474-class GroovyTestNetworkIPV6(relbase.groovy, TestNetworkIPV6Abs):
475- __test__ = True
476-
477-
478 class Centos66TestNetworkIPV6(centos_relbase.centos66_xenial,
479 CentosTestNetworkIPV6Abs):
480 __test__ = True
481diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
482index c3e5b5a..f24aab5 100644
483--- a/tests/vmtests/test_network_ipv6_static.py
484+++ b/tests/vmtests/test_network_ipv6_static.py
485@@ -31,7 +31,7 @@ class HirsuteTestNetworkIPV6Static(relbase.hirsute, TestNetworkIPV6StaticAbs):
486 __test__ = True
487
488
489-class GroovyTestNetworkIPV6Static(relbase.groovy, TestNetworkIPV6StaticAbs):
490+class ImpishTestNetworkIPV6Static(relbase.impish, TestNetworkIPV6StaticAbs):
491 __test__ = True
492
493
494diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
495index 96c056b..a6eae41 100644
496--- a/tests/vmtests/test_network_ipv6_vlan.py
497+++ b/tests/vmtests/test_network_ipv6_vlan.py
498@@ -30,7 +30,7 @@ class HirsuteTestNetworkIPV6Vlan(relbase.hirsute, TestNetworkIPV6VlanAbs):
499 __test__ = True
500
501
502-class GroovyTestNetworkIPV6Vlan(relbase.groovy, TestNetworkIPV6VlanAbs):
503+class ImpishTestNetworkIPV6Vlan(relbase.impish, TestNetworkIPV6VlanAbs):
504 __test__ = True
505
506
507diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
508index 8e6e57c..a36a752 100644
509--- a/tests/vmtests/test_network_mtu.py
510+++ b/tests/vmtests/test_network_mtu.py
511@@ -197,7 +197,7 @@ class HirsuteTestNetworkMtu(relbase.hirsute, TestNetworkMtuNetworkdAbs):
512 __test__ = True
513
514
515-class GroovyTestNetworkMtu(relbase.groovy, TestNetworkMtuNetworkdAbs):
516+class ImpishTestNetworkMtu(relbase.impish, TestNetworkMtuNetworkdAbs):
517 __test__ = True
518
519
520diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py
521index a32d637..3e8699d 100644
522--- a/tests/vmtests/test_network_ovs.py
523+++ b/tests/vmtests/test_network_ovs.py
524@@ -42,7 +42,8 @@ class HirsuteTestNetworkOvs(relbase.hirsute, TestNetworkOvsAbs):
525 __test__ = True
526
527
528-class GroovyTestNetworkOvs(relbase.groovy, TestNetworkOvsAbs):
529+class ImpishTestNetworkOvs(relbase.impish, TestNetworkOvsAbs):
530 __test__ = True
531
532+
533 # vi: ts=4 expandtab syntax=python
534diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
535index abcbb75..95960af 100644
536--- a/tests/vmtests/test_network_static.py
537+++ b/tests/vmtests/test_network_static.py
538@@ -36,7 +36,7 @@ class HirsuteTestNetworkStatic(relbase.hirsute, TestNetworkStaticAbs):
539 __test__ = True
540
541
542-class GroovyTestNetworkStatic(relbase.groovy, TestNetworkStaticAbs):
543+class ImpishTestNetworkStatic(relbase.impish, TestNetworkStaticAbs):
544 __test__ = True
545
546
547diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
548index e158f9a..eb096ee 100644
549--- a/tests/vmtests/test_network_static_routes.py
550+++ b/tests/vmtests/test_network_static_routes.py
551@@ -38,7 +38,7 @@ class HirsuteTestNetworkStaticRoutes(relbase.hirsute,
552 __test__ = True
553
554
555-class GroovyTestNetworkStaticRoutes(relbase.groovy,
556+class ImpishTestNetworkStaticRoutes(relbase.impish,
557 TestNetworkStaticRoutesAbs):
558 __test__ = True
559
560diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
561index af52af0..1f78cfa 100644
562--- a/tests/vmtests/test_network_vlan.py
563+++ b/tests/vmtests/test_network_vlan.py
564@@ -90,9 +90,12 @@ class HirsuteTestNetworkVlan(relbase.hirsute, TestNetworkVlanAbs):
565 return super().test_ip_output()
566
567
568-class GroovyTestNetworkVlan(relbase.groovy, TestNetworkVlanAbs):
569+class ImpishTestNetworkVlan(relbase.impish, TestNetworkVlanAbs):
570 __test__ = True
571
572+ def test_ip_output(self):
573+ return super().test_ip_output()
574+
575
576 class Centos66TestNetworkVlan(centos_relbase.centos66_xenial,
577 CentosTestNetworkVlanAbs):
578diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
579index 9531a80..01f5a54 100644
580--- a/tests/vmtests/test_nvme.py
581+++ b/tests/vmtests/test_nvme.py
582@@ -73,10 +73,6 @@ class BionicTestNvme(relbase.bionic, TestNvmeAbs):
583 __test__ = True
584
585
586-class GroovyTestNvme(relbase.groovy, TestNvmeAbs):
587- __test__ = True
588-
589-
590 class TestNvmeBcacheAbs(TestNvmeAbs):
591 arch_skip = [
592 "s390x", # nvme is a pci device, no pci on s390x
593@@ -147,7 +143,7 @@ class HirsuteTestNvmeBcache(relbase.hirsute, TestNvmeBcacheAbs):
594 __test__ = True
595
596
597-class GroovyTestNvmeBcache(relbase.groovy, TestNvmeBcacheAbs):
598+class ImpishTestNvmeBcache(relbase.impish, TestNvmeBcacheAbs):
599 __test__ = True
600
601
602diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py
603index e841f2a..a5533f9 100644
604--- a/tests/vmtests/test_panic.py
605+++ b/tests/vmtests/test_panic.py
606@@ -33,7 +33,7 @@ class HirsuteTestInstallPanic(relbase.hirsute, TestInstallPanic):
607 __test__ = True
608
609
610-class GroovyTestInstallPanic(relbase.groovy, TestInstallPanic):
611+class ImpishTestInstallPanic(relbase.impish, TestInstallPanic):
612 __test__ = True
613
614
615diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
616index 4aeefd8..fa33ec5 100644
617--- a/tests/vmtests/test_pollinate_useragent.py
618+++ b/tests/vmtests/test_pollinate_useragent.py
619@@ -69,7 +69,7 @@ class HirsuteTestPollinateUserAgent(relbase.hirsute, TestPollinateUserAgent):
620 __test__ = True
621
622
623-class GroovyTestPollinateUserAgent(relbase.groovy, TestPollinateUserAgent):
624+class ImpishTestPollinateUserAgent(relbase.impish, TestPollinateUserAgent):
625 __test__ = True
626
627
628diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py
629index 28dd34f..74fe29e 100644
630--- a/tests/vmtests/test_preserve.py
631+++ b/tests/vmtests/test_preserve.py
632@@ -33,7 +33,7 @@ class HirsuteTestPreserve(relbase.hirsute, TestPreserve):
633 __test__ = True
634
635
636-class GroovyTestPreserve(relbase.groovy, TestPreserve):
637+class ImpishTestPreserve(relbase.impish, TestPreserve):
638 __test__ = True
639
640
641diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py
642index 2e6b412..46edd3f 100644
643--- a/tests/vmtests/test_preserve_bcache.py
644+++ b/tests/vmtests/test_preserve_bcache.py
645@@ -64,7 +64,7 @@ class HirsuteTestPreserveBcache(relbase.hirsute, TestPreserveBcache):
646 __test__ = True
647
648
649-class GroovyTestPreserveBcache(relbase.groovy, TestPreserveBcache):
650+class ImpishTestPreserveBcache(relbase.impish, TestPreserveBcache):
651 __test__ = True
652
653
654diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py
655index 274e9c6..0c09c11 100644
656--- a/tests/vmtests/test_preserve_lvm.py
657+++ b/tests/vmtests/test_preserve_lvm.py
658@@ -77,7 +77,7 @@ class HirsuteTestLvmPreserve(relbase.hirsute, TestLvmPreserveAbs):
659 __test__ = True
660
661
662-class GroovyTestLvmPreserve(relbase.groovy, TestLvmPreserveAbs):
663+class ImpishTestLvmPreserve(relbase.impish, TestLvmPreserveAbs):
664 __test__ = True
665
666
667diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py
668index 2469615..4db6c2b 100644
669--- a/tests/vmtests/test_preserve_partition_wipe_vg.py
670+++ b/tests/vmtests/test_preserve_partition_wipe_vg.py
671@@ -33,7 +33,7 @@ class HirsuteTestPreserveWipeLvm(relbase.hirsute, TestPreserveWipeLvm):
672 __test__ = True
673
674
675-class GroovyTestPreserveWipeLvm(relbase.groovy, TestPreserveWipeLvm):
676+class ImpishTestPreserveWipeLvm(relbase.impish, TestPreserveWipeLvm):
677 __test__ = True
678
679
680@@ -61,7 +61,7 @@ class HirsuteTestPreserveWipeLvmSimple(relbase.hirsute,
681 __test__ = True
682
683
684-class GroovyTestPreserveWipeLvmSimple(relbase.groovy,
685+class ImpishTestPreserveWipeLvmSimple(relbase.impish,
686 TestPreserveWipeLvmSimple):
687 __test__ = True
688
689diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
690index 8c85a20..4bb977e 100644
691--- a/tests/vmtests/test_preserve_raid.py
692+++ b/tests/vmtests/test_preserve_raid.py
693@@ -33,7 +33,7 @@ class HirsuteTestPreserveRAID(relbase.hirsute, TestPreserveRAID):
694 __test__ = True
695
696
697-class GroovyTestPreserveRAID(relbase.groovy, TestPreserveRAID):
698+class ImpishTestPreserveRAID(relbase.impish, TestPreserveRAID):
699 __test__ = True
700
701
702@@ -67,8 +67,8 @@ class HirsuteTestPartitionExistingRAID(
703 __test__ = True
704
705
706-class GroovyTestPartitionExistingRAID(
707- relbase.groovy, TestPartitionExistingRAID):
708+class ImpishTestPartitionExistingRAID(
709+ relbase.impish, TestPartitionExistingRAID):
710 __test__ = True
711
712
713diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
714index 493c0fd..e682f34 100644
715--- a/tests/vmtests/test_raid5_bcache.py
716+++ b/tests/vmtests/test_raid5_bcache.py
717@@ -96,7 +96,7 @@ class HirsuteTestRaid5Bcache(relbase.hirsute, TestMdadmBcacheAbs):
718 __test__ = True
719
720
721-class GroovyTestRaid5Bcache(relbase.groovy, TestMdadmBcacheAbs):
722+class ImpishTestRaid5Bcache(relbase.impish, TestMdadmBcacheAbs):
723 __test__ = True
724
725
726diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py
727index aaa73f2..a2bd1be 100644
728--- a/tests/vmtests/test_raid_partition_to_disk.py
729+++ b/tests/vmtests/test_raid_partition_to_disk.py
730@@ -26,7 +26,7 @@ class HirsuteTestRAIDPartitionToDisk(relbase.hirsute, TestRAIDPartitionToDisk):
731 __test__ = True
732
733
734-class GroovyTestRAIDPartitionToDisk(relbase.groovy, TestRAIDPartitionToDisk):
735+class ImpishTestRAIDPartitionToDisk(relbase.impish, TestRAIDPartitionToDisk):
736 __test__ = True
737
738
739diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py
740index eba3d1b..81c0cb0 100644
741--- a/tests/vmtests/test_reuse_lvm_member.py
742+++ b/tests/vmtests/test_reuse_lvm_member.py
743@@ -31,7 +31,7 @@ class HirsuteTestReuseLVMMemberPartition(relbase.hirsute,
744 __test__ = True
745
746
747-class GroovyTestReuseLVMMemberPartition(relbase.groovy,
748+class ImpishTestReuseLVMMemberPartition(relbase.impish,
749 TestReuseLVMMemberPartition):
750 __test__ = True
751
752diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py
753index 77431bf..ed52f5b 100644
754--- a/tests/vmtests/test_reuse_msdos_partitions.py
755+++ b/tests/vmtests/test_reuse_msdos_partitions.py
756@@ -28,7 +28,7 @@ class HirsuteTestReuseMSDOSPartitions(relbase.hirsute,
757 __test__ = True
758
759
760-class GroovyTestReuseMSDOSPartitions(relbase.groovy,
761+class ImpishTestReuseMSDOSPartitions(relbase.impish,
762 TestReuseMSDOSPartitions):
763 __test__ = True
764
765diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py
766index e3723e8..7611140 100644
767--- a/tests/vmtests/test_reuse_raid_member.py
768+++ b/tests/vmtests/test_reuse_raid_member.py
769@@ -36,7 +36,7 @@ class HirsuteTestReuseRAIDMember(relbase.hirsute, TestReuseRAIDMember):
770 __test__ = True
771
772
773-class GroovyTestReuseRAIDMember(relbase.groovy, TestReuseRAIDMember):
774+class ImpishTestReuseRAIDMember(relbase.impish, TestReuseRAIDMember):
775 __test__ = True
776
777
778@@ -55,7 +55,7 @@ class HirsuteTestReuseRAIDMemberPartition(relbase.hirsute,
779 __test__ = True
780
781
782-class GroovyTestReuseRAIDMemberPartition(relbase.groovy,
783+class ImpishTestReuseRAIDMemberPartition(relbase.impish,
784 TestReuseRAIDMemberPartition):
785 __test__ = True
786
787diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py
788index 46f3a57..958e43f 100644
789--- a/tests/vmtests/test_reuse_uefi_esp.py
790+++ b/tests/vmtests/test_reuse_uefi_esp.py
791@@ -49,7 +49,7 @@ class HirsuteTestUefiReuseEsp(relbase.hirsute, TestUefiReuseEspAbs):
792 return super().test_efiboot_menu_has_one_distro_entry()
793
794
795-class GroovyTestUefiReuseEsp(relbase.groovy, TestUefiReuseEspAbs):
796+class ImpishTestUefiReuseEsp(relbase.impish, TestUefiReuseEspAbs):
797 __test__ = True
798
799 def test_efiboot_menu_has_one_distro_entry(self):
800diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
801index 83dca96..0ee87fc 100644
802--- a/tests/vmtests/test_simple.py
803+++ b/tests/vmtests/test_simple.py
804@@ -63,7 +63,7 @@ class HirsuteTestSimple(relbase.hirsute, TestSimple):
805 self.output_files_exist(["netplan.yaml"])
806
807
808-class GroovyTestSimple(relbase.groovy, TestSimple):
809+class ImpishTestSimple(relbase.impish, TestSimple):
810 __test__ = True
811
812 def test_output_files_exist(self):
813@@ -126,7 +126,7 @@ class HirsuteTestSimpleStorage(relbase.hirsute, TestSimpleStorage):
814 self.output_files_exist(["netplan.yaml"])
815
816
817-class GroovyTestSimpleStorage(relbase.groovy, TestSimpleStorage):
818+class ImpishTestSimpleStorage(relbase.impish, TestSimpleStorage):
819 __test__ = True
820
821 def test_output_files_exist(self):
822@@ -166,7 +166,7 @@ class HirsuteTestGrubNoDefaults(relbase.hirsute, TestGrubNoDefaults):
823 self.output_files_exist(["netplan.yaml"])
824
825
826-class GroovyTestGrubNoDefaults(relbase.groovy, TestGrubNoDefaults):
827+class ImpishTestGrubNoDefaults(relbase.impish, TestGrubNoDefaults):
828 __test__ = True
829
830 def test_output_files_exist(self):
831diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
832index 0ed4fab..aa4c650 100644
833--- a/tests/vmtests/test_uefi_basic.py
834+++ b/tests/vmtests/test_uefi_basic.py
835@@ -118,7 +118,7 @@ class HirsuteUefiTestBasic(relbase.hirsute, TestBasicAbs):
836 __test__ = True
837
838
839-class GroovyUefiTestBasic(relbase.groovy, TestBasicAbs):
840+class ImpishUefiTestBasic(relbase.impish, TestBasicAbs):
841 __test__ = True
842
843
844@@ -147,7 +147,7 @@ class HirsuteUefiTestBasic4k(relbase.hirsute, TestBasicAbs):
845 disk_block_size = 4096
846
847
848-class GroovyUefiTestBasic4k(relbase.groovy, TestBasicAbs):
849+class ImpishUefiTestBasic4k(relbase.impish, TestBasicAbs):
850 __test__ = True
851 disk_block_size = 4096
852
853diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
854index 21e33b6..0e310c6 100644
855--- a/tests/vmtests/test_zfsroot.py
856+++ b/tests/vmtests/test_zfsroot.py
857@@ -106,7 +106,7 @@ class HirsuteTestZfsRoot(relbase.hirsute, TestZfsRootAbs):
858 mem = 4096
859
860
861-class GroovyTestZfsRoot(relbase.groovy, TestZfsRootAbs):
862+class ImpishTestZfsRoot(relbase.impish, TestZfsRootAbs):
863 __test__ = True
864 mem = 4096
865
866@@ -140,7 +140,9 @@ class HirsuteTestZfsRootFsType(relbase.hirsute, TestZfsRootFsTypeAbs):
867 mem = 4096
868
869
870-class GroovyTestZfsRootFsType(relbase.groovy, TestZfsRootFsTypeAbs):
871+class ImpishTestZfsRootFsType(relbase.impish, TestZfsRootFsTypeAbs):
872 __test__ = True
873+ mem = 4096
874+
875
876 # vi: ts=4 expandtab syntax=python

Subscribers

People subscribed via source and target branches