Skip to content

Commit 8ae0ac8

Browse files
committed
WIP (failing) indirect upgrade from 7.5
Can only succeed with a certificate refresh in between
1 parent d8bfaa7 commit 8ae0ac8

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

tests/install/test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,18 +319,21 @@ def test_boot_inst(self, create_vms,
319319
("821.1", "83nightly"),
320320
("81", "83nightly"),
321321
("80", "83nightly"),
322+
("75-821.1", "83nightly"),
322323
("xs8", "83nightly"),
323324
("ch821.1", "83nightly"),
324325
("830net", "830net"), # FIXME
325326
("82nightly", "82nightly"),
326327
("821.1", "82nightly"),
327328
("821.1", "821.1"),
329+
("75", "821.1"),
328330
])
329331
@pytest.mark.parametrize("firmware", ("uefi", "bios"))
330332
@pytest.mark.continuation_of(
331333
lambda firmware, orig_version, machine, package_source, local_sr: [dict(
332334
vm="vm1",
333-
image_test=f"TestNested::test_boot_inst[{firmware}-{orig_version}-{machine}-{package_source}-{local_sr}]")])
335+
image_test=(f"TestNested::test_boot_{'upg' if '-' in orig_version else 'inst'}"
336+
f"[{firmware}-{orig_version}-{machine}-{package_source}-{local_sr}]"))])
334337
@pytest.mark.answerfile(
335338
lambda install_disk: AnswerFile("UPGRADE").top_append(
336339
{"TAG": "source", "type": "local"},
@@ -358,6 +361,7 @@ def test_upgrade(self, vm_booted_with_installer, install_disk,
358361
"82nightly-82nightly",
359362
"821.1-82nightly",
360363
"821.1-821.1",
364+
"75-821.1",
361365
))
362366
@pytest.mark.parametrize("firmware", ("uefi", "bios"))
363367
@pytest.mark.continuation_of(

0 commit comments

Comments
 (0)