Skip to content

Commit e6f20bc

Browse files
committed
install: 7.5 and 7.6
1 parent 1b60f64 commit e6f20bc

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

tests/install/test.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@pytest.mark.dependency()
1212
class TestNested:
1313
@pytest.mark.parametrize("iso_version", (
14-
"80", "81",
14+
"75", "76", "80", "81",
1515
"ch821.1", "xs8",
1616
"821.1", "83b2",
1717
))
@@ -39,6 +39,8 @@ class TestNested:
3939
param_mapping={"firmware": "firmware"})
4040
@pytest.mark.installer_iso(
4141
lambda version: {
42+
"75": "xcpng-7.5",
43+
"76": "xcpng-7.6",
4244
"80": "xcpng-8.0",
4345
"81": "xcpng-8.1",
4446
"821.1": "xcpng-8.2.1-2023",
@@ -139,11 +141,14 @@ def test_install(self, request, firmware, iso_remaster, create_vms, iso_version)
139141
"821.1-83b2-83b2",
140142
"81-83b2", "81-83b2-83b2",
141143
"80-83b2", "80-83b2-83b2",
144+
"76-83b2", "76-83b2-83b2",
145+
"75-83b2", "75-83b2-83b2",
142146
"ch821.1-83b2",
143147
"ch821.1-83b2-83b2",
144148
"821.1",
145149
"821.1-821.1",
146150
"81", "80",
151+
"76", "75",
147152
"ch821.1", "xs8",
148153
))
149154
@pytest.mark.parametrize("firmware", ("uefi", "bios"))
@@ -180,6 +185,8 @@ def test_firstboot(self, firmware, request, create_vms, mode):
180185
expected_rel = {
181186
"ch821.1": "8.2.1",
182187
"xs8": "8.4.0",
188+
"75": "7.5.0",
189+
"76": "7.6.0",
183190
"80": "8.0.0",
184191
"81": "8.1.0",
185192
"821.1": "8.2.1",
@@ -244,7 +251,7 @@ def test_firstboot(self, firmware, request, create_vms, mode):
244251
]
245252
STAMPS_DIR = "/var/lib/misc"
246253
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"]:
248255
SERVICES = ["xs-firstboot"]
249256
STAMPS_DIR = "/etc/firstboot.d/state"
250257
STAMPS = [
@@ -258,11 +265,14 @@ def test_firstboot(self, firmware, request, create_vms, mode):
258265
"60-import-keys",
259266
"60-upgrade-likewise-to-pbis",
260267
"62-create-guest-templates",
261-
"80-common-criteria",
262268
"90-flush-pool-db",
263269
"95-legacy-logrotate",
264270
"99-remove-firstboot-flag",
265271
]
272+
if lsb_rel in ["8.0.0", "8.1.0"]:
273+
STAMPS += [
274+
"80-common-criteria",
275+
]
266276
# check for firstboot issues
267277
# FIXME: flaky, must check logs extraction on failure
268278
try:
@@ -309,6 +319,8 @@ def test_firstboot(self, firmware, request, create_vms, mode):
309319
@pytest.mark.usefixtures("xcpng_chained")
310320
@pytest.mark.parametrize(("orig_version", "iso_version"), [
311321
("821.1", "821.1"),
322+
("75", "83b2"),
323+
("76", "83b2"),
312324
("80", "83b2"),
313325
("81", "83b2"),
314326
("ch821.1", "83b2"),
@@ -414,6 +426,8 @@ def test_upgrade(self, firmware, iso_remaster, create_vms, orig_version, iso_ver
414426
@pytest.mark.usefixtures("xcpng_chained")
415427
@pytest.mark.parametrize(("orig_version", "iso_version"), [
416428
("821.1-83b2", "83b2"),
429+
("75-83b2", "83b2"),
430+
("76-83b2", "83b2"),
417431
("80-83b2", "83b2"),
418432
("81-83b2", "83b2"),
419433
("ch821.1-83b2", "83b2"),

0 commit comments

Comments
 (0)