17
17
@pytest .mark .dependency ()
18
18
class TestNested :
19
19
@pytest .mark .parametrize ("iso_version" , (
20
- "80" , "81" ,
20
+ "75" , "76" , " 80" , "81" ,
21
21
"ch821.1" , "xs8" ,
22
22
"821.1" , "83b2" ,
23
23
))
24
24
@pytest .mark .parametrize ("firmware" , ("uefi" , "bios" ))
25
25
@pytest .mark .installer_iso (
26
26
lambda version : {
27
+ "75" : "xcpng-7.5" ,
28
+ "76" : "xcpng-7.6" ,
27
29
"80" : "xcpng-8.0" ,
28
30
"81" : "xcpng-8.1" ,
29
31
"821.1" : "xcpng-8.2.1-2023" ,
@@ -147,17 +149,17 @@ def test_install(self, request, firmware, iso_version, iso_remaster, create_vms)
147
149
@pytest .mark .usefixtures ("xcpng_chained" )
148
150
# FIXME take "uefi" outa here and allow "bios"
149
151
@pytest .mark .parametrize ("mode" , [
150
- "80" , "81" ,
152
+ "75" , "76" , " 80" , "81" ,
151
153
"ch821.1" , "xs8" ,
152
154
"821.1" ,
153
155
"821.1-821.1" ,
154
156
"83b2" ,
155
157
"821.1-83b2" ,
156
- "81-83b2" , "80-83b2" ,
158
+ "81-83b2" , "80-83b2" , "76-83b2" , "75-83b2" ,
157
159
"ch821.1-83b2" ,
158
160
#"83b2-83b2", # 8.3b2 disabled the upgrade from 8.3
159
161
"821.1-83b2-83b2" ,
160
- "81-83b2-83b2" , "80-83b2-83b2" ,
162
+ "81-83b2-83b2" , "80-83b2-83b2" , "76-83b2-83b2" , "75-83b2-83b2" ,
161
163
"ch821.1-83b2-83b2" ,
162
164
])
163
165
@pytest .mark .parametrize ("firmware" , ("uefi" , "bios" ))
@@ -194,6 +196,8 @@ def test_firstboot(self, firmware, request, create_vms, mode):
194
196
expected_rel = {
195
197
"ch821.1" : "8.2.1" ,
196
198
"xs8" : "8.4.0" ,
199
+ "75" : "7.5.0" ,
200
+ "76" : "7.6.0" ,
197
201
"80" : "8.0.0" ,
198
202
"81" : "8.1.0" ,
199
203
"821.1" : "8.2.1" ,
@@ -258,7 +262,7 @@ def test_firstboot(self, firmware, request, create_vms, mode):
258
262
]
259
263
STAMPS_DIR = "/var/lib/misc"
260
264
STAMPS = [f"ran-{ service } " for service in SERVICES ]
261
- elif lsb_rel in ["8.0.0" , "8.1.0" ]:
265
+ elif lsb_rel in ["7.5.0" , "7.6.0" , " 8.0.0" , "8.1.0" ]:
262
266
SERVICES = ["xs-firstboot" ]
263
267
STAMPS_DIR = "/etc/firstboot.d/state"
264
268
STAMPS = [
@@ -272,11 +276,14 @@ def test_firstboot(self, firmware, request, create_vms, mode):
272
276
"60-import-keys" ,
273
277
"60-upgrade-likewise-to-pbis" ,
274
278
"62-create-guest-templates" ,
275
- "80-common-criteria" ,
276
279
"90-flush-pool-db" ,
277
280
"95-legacy-logrotate" ,
278
281
"99-remove-firstboot-flag" ,
279
282
]
283
+ if lsb_rel in ["8.0.0" , "8.1.0" ]:
284
+ STAMPS += [
285
+ "80-common-criteria" ,
286
+ ]
280
287
# check for firstboot issues
281
288
# FIXME: flaky, must check logs extraction on failure
282
289
try :
@@ -330,6 +337,8 @@ def test_firstboot(self, firmware, request, create_vms, mode):
330
337
@pytest .mark .usefixtures ("xcpng_chained" )
331
338
@pytest .mark .parametrize (("orig_version" , "iso_version" ), [
332
339
("821.1" , "821.1" ),
340
+ ("75" , "83b2" ),
341
+ ("76" , "83b2" ),
333
342
("80" , "83b2" ),
334
343
("81" , "83b2" ),
335
344
("ch821.1" , "83b2" ),
@@ -440,6 +449,8 @@ def test_upgrade(self, request, firmware, orig_version, iso_version, iso_remaste
440
449
@pytest .mark .usefixtures ("xcpng_chained" )
441
450
@pytest .mark .parametrize (("orig_version" , "iso_version" ), [
442
451
("821.1-83b2" , "83b2" ),
452
+ ("75-83b2" , "83b2" ),
453
+ ("76-83b2" , "83b2" ),
443
454
("80-83b2" , "83b2" ),
444
455
("81-83b2" , "83b2" ),
445
456
("ch821.1-83b2" , "83b2" ),
0 commit comments