11
11
@pytest .mark .dependency ()
12
12
class TestNested :
13
13
@pytest .mark .parametrize ("iso_version" , (
14
- "80" , "81" ,
14
+ "75" , "76" , " 80" , "81" ,
15
15
"ch821.1" , "xs8" ,
16
16
"821.1" , "83b2" ,
17
17
))
@@ -39,6 +39,8 @@ class TestNested:
39
39
param_mapping = {"firmware" : "firmware" })
40
40
@pytest .mark .installer_iso (
41
41
lambda version : {
42
+ "75" : "xcpng-7.5" ,
43
+ "76" : "xcpng-7.6" ,
42
44
"80" : "xcpng-8.0" ,
43
45
"81" : "xcpng-8.1" ,
44
46
"821.1" : "xcpng-8.2.1-2023" ,
@@ -139,11 +141,14 @@ def test_install(self, firmware, iso_remaster, create_vms, iso_version):
139
141
"821.1-83b2-83b2" ,
140
142
"81-83b2" , "81-83b2-83b2" ,
141
143
"80-83b2" , "80-83b2-83b2" ,
144
+ "76-83b2" , "76-83b2-83b2" ,
145
+ "75-83b2" , "75-83b2-83b2" ,
142
146
"ch821.1-83b2" ,
143
147
"ch821.1-83b2-83b2" ,
144
148
"821.1" ,
145
149
"821.1-821.1" ,
146
150
"81" , "80" ,
151
+ "76" , "75" ,
147
152
"ch821.1" , "xs8" ,
148
153
))
149
154
@pytest .mark .parametrize ("firmware" , ("uefi" , "bios" ))
@@ -180,6 +185,8 @@ def test_firstboot(self, firmware, create_vms, mode):
180
185
expected_rel = {
181
186
"ch821.1" : "8.2.1" ,
182
187
"xs8" : "8.4.0" ,
188
+ "75" : "7.5.0" ,
189
+ "76" : "7.6.0" ,
183
190
"80" : "8.0.0" ,
184
191
"81" : "8.1.0" ,
185
192
"821.1" : "8.2.1" ,
@@ -244,7 +251,7 @@ def test_firstboot(self, firmware, create_vms, mode):
244
251
]
245
252
STAMPS_DIR = "/var/lib/misc"
246
253
STAMPS = [f"ran-{ service } " for service in SERVICES ]
247
- elif lsb_rel in ["8.0.0" , "8.1.0" ]:
254
+ elif lsb_rel in ["7.5.0" , "7.6.0" , " 8.0.0" , "8.1.0" ]:
248
255
SERVICES = ["xs-firstboot" ]
249
256
STAMPS_DIR = "/etc/firstboot.d/state"
250
257
STAMPS = [
@@ -258,11 +265,14 @@ def test_firstboot(self, firmware, create_vms, mode):
258
265
"60-import-keys" ,
259
266
"60-upgrade-likewise-to-pbis" ,
260
267
"62-create-guest-templates" ,
261
- "80-common-criteria" ,
262
268
"90-flush-pool-db" ,
263
269
"95-legacy-logrotate" ,
264
270
"99-remove-firstboot-flag" ,
265
271
]
272
+ if lsb_rel in ["8.0.0" , "8.1.0" ]:
273
+ STAMPS += [
274
+ "80-common-criteria" ,
275
+ ]
266
276
# check for firstboot issues
267
277
# FIXME: flaky, must check logs extraction on failure
268
278
try :
@@ -309,6 +319,8 @@ def test_firstboot(self, firmware, create_vms, mode):
309
319
@pytest .mark .usefixtures ("xcpng_chained" )
310
320
@pytest .mark .parametrize (("orig_version" , "iso_version" ), [
311
321
("821.1" , "821.1" ),
322
+ ("75" , "83b2" ),
323
+ ("76" , "83b2" ),
312
324
("80" , "83b2" ),
313
325
("81" , "83b2" ),
314
326
("ch821.1" , "83b2" ),
@@ -414,6 +426,8 @@ def test_upgrade(self, firmware, iso_remaster, create_vms, orig_version, iso_ver
414
426
@pytest .mark .usefixtures ("xcpng_chained" )
415
427
@pytest .mark .parametrize (("orig_version" , "iso_version" ), [
416
428
("821.1-83b2" , "83b2" ),
429
+ ("75-83b2" , "83b2" ),
430
+ ("76-83b2" , "83b2" ),
417
431
("80-83b2" , "83b2" ),
418
432
("81-83b2" , "83b2" ),
419
433
("ch821.1-83b2" , "83b2" ),
0 commit comments