Skip to content

Commit d768ea5

Browse files
committed
WIP (failing) indirect upgrade from 7.5
Can only succeed with a certificate refresh in between
1 parent 19ef189 commit d768ea5

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Diff for: tests/install/test.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -320,16 +320,19 @@ def test_boot_inst(self, create_vms,
320320
("821.1", "83nightly"),
321321
("81", "83nightly"),
322322
("80", "83nightly"),
323+
("75-821.1", "83nightly"),
323324
("xs8", "83nightly"),
324325
("ch821.1", "83nightly"),
325326
("83rcnet", "83rcnet"), # FIXME
326327
("821.1", "821.1"),
328+
("75", "821.1"),
327329
])
328330
@pytest.mark.parametrize("firmware", ("uefi", "bios"))
329331
@pytest.mark.continuation_of(
330332
lambda firmware, orig_version, machine, source_type, local_sr: [dict(
331333
vm="vm1",
332-
image_test=f"TestNested::test_boot_inst[{firmware}-{orig_version}-{machine}-{source_type}-{local_sr}]")])
334+
image_test=(f"TestNested::test_boot_{'upg' if '-' in orig_version else 'inst'}"
335+
f"[{firmware}-{orig_version}-{machine}-{source_type}-{local_sr}]"))])
333336
@pytest.mark.answerfile(
334337
lambda install_disk: AnswerFile("UPGRADE").top_append(
335338
{"TAG": "source", "type": "local"},
@@ -357,6 +360,7 @@ def test_upgrade(self, vm_booted_with_installer, install_disk,
357360
"xs8-83nightly",
358361
"83rcnet-83rcnet",
359362
"821.1-821.1",
363+
"75-821.1",
360364
))
361365
@pytest.mark.parametrize("firmware", ("uefi", "bios"))
362366
@pytest.mark.continuation_of(

0 commit comments

Comments
 (0)