Skip to content

Commit 71c93d3

Browse files
committed
WIP install: 7.5 and 7.6
1 parent 0bba20d commit 71c93d3

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

tests/install/test.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
@pytest.mark.dependency()
1818
class TestNested:
1919
@pytest.mark.parametrize("iso_version", (
20-
"80", "81",
20+
"75", "76", "80", "81",
2121
"ch821.1", "xs8",
2222
"821.1", "83b2",
2323
))
2424
@pytest.mark.parametrize("firmware", ("uefi", "bios"))
2525
@pytest.mark.installer_iso(
2626
lambda version: {
27+
"75": "xcpng-7.5",
28+
"76": "xcpng-7.6",
2729
"80": "xcpng-8.0",
2830
"81": "xcpng-8.1",
2931
"821.1": "xcpng-8.2.1-2023",
@@ -147,17 +149,17 @@ def test_install(self, request, firmware, iso_version, iso_remaster, create_vms)
147149
@pytest.mark.usefixtures("xcpng_chained")
148150
# FIXME take "uefi" outa here and allow "bios"
149151
@pytest.mark.parametrize("mode", [
150-
"80", "81",
152+
"75", "76", "80", "81",
151153
"ch821.1", "xs8",
152154
"821.1",
153155
"821.1-821.1",
154156
"83b2",
155157
"821.1-83b2",
156-
"81-83b2", "80-83b2",
158+
"81-83b2", "80-83b2", "76-83b2", "75-83b2",
157159
"ch821.1-83b2",
158160
#"83b2-83b2", # 8.3b2 disabled the upgrade from 8.3
159161
"821.1-83b2-83b2",
160-
"81-83b2-83b2", "80-83b2-83b2",
162+
"81-83b2-83b2", "80-83b2-83b2", "76-83b2-83b2", "75-83b2-83b2",
161163
"ch821.1-83b2-83b2",
162164
])
163165
@pytest.mark.parametrize("firmware", ("uefi", "bios"))
@@ -194,6 +196,8 @@ def test_firstboot(self, firmware, request, create_vms, mode):
194196
expected_rel = {
195197
"ch821.1": "8.2.1",
196198
"xs8": "8.4.0",
199+
"75": "7.5.0",
200+
"76": "7.6.0",
197201
"80": "8.0.0",
198202
"81": "8.1.0",
199203
"821.1": "8.2.1",
@@ -258,7 +262,7 @@ def test_firstboot(self, firmware, request, create_vms, mode):
258262
]
259263
STAMPS_DIR = "/var/lib/misc"
260264
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"]:
262266
SERVICES = ["xs-firstboot"]
263267
STAMPS_DIR = "/etc/firstboot.d/state"
264268
STAMPS = [
@@ -272,11 +276,14 @@ def test_firstboot(self, firmware, request, create_vms, mode):
272276
"60-import-keys",
273277
"60-upgrade-likewise-to-pbis",
274278
"62-create-guest-templates",
275-
"80-common-criteria",
276279
"90-flush-pool-db",
277280
"95-legacy-logrotate",
278281
"99-remove-firstboot-flag",
279282
]
283+
if lsb_rel in ["8.0.0", "8.1.0"]:
284+
STAMPS += [
285+
"80-common-criteria",
286+
]
280287
# check for firstboot issues
281288
# FIXME: flaky, must check logs extraction on failure
282289
try:
@@ -330,6 +337,8 @@ def test_firstboot(self, firmware, request, create_vms, mode):
330337
@pytest.mark.usefixtures("xcpng_chained")
331338
@pytest.mark.parametrize(("orig_version", "iso_version"), [
332339
("821.1", "821.1"),
340+
("75", "83b2"),
341+
("76", "83b2"),
333342
("80", "83b2"),
334343
("81", "83b2"),
335344
("ch821.1", "83b2"),
@@ -440,6 +449,8 @@ def test_upgrade(self, request, firmware, orig_version, iso_version, iso_remaste
440449
@pytest.mark.usefixtures("xcpng_chained")
441450
@pytest.mark.parametrize(("orig_version", "iso_version"), [
442451
("821.1-83b2", "83b2"),
452+
("75-83b2", "83b2"),
453+
("76-83b2", "83b2"),
443454
("80-83b2", "83b2"),
444455
("81-83b2", "83b2"),
445456
("ch821.1-83b2", "83b2"),

0 commit comments

Comments
 (0)