Skip to content

Commit d5d3796

Browse files
committed
WIP indirect upgrade from XS 6.5
1 parent ea9d2f3 commit d5d3796

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

lib/config.py

+4
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@ def sr_device_config(datakey, *, required=[]):
6565
install.test::Nested::boot_inst[uefi-xs8-host1-iso-ext]
6666
install.test::Nested::boot_inst[uefi-xs8-host2-iso-ext]
6767
""".split()
68+
} | {
69+
f"{x}-vm1": f"{x}-vm1-72f98fabd4f5506cb5f2f8c0a59cbcf5af7a478f" for x in """
70+
install.test::Nested::boot_inst[bios-xs65-host1-iso-nosr]
71+
""".split()
6872
}

tests/install/test.py

+6
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,16 @@ def test_boot_inst(self, create_vms,
337337
("81", "83nightly"),
338338
("80", "83nightly"),
339339
("75-821.1", "83nightly"),
340+
("xs65-75-821.1", "83nightly"),
340341
("xs8", "83nightly"),
341342
("ch821.1", "83nightly"),
342343
("830net", "830net"), # FIXME
343344
("82nightly", "82nightly"),
344345
("821.1", "82nightly"),
345346
("821.1", "821.1"),
346347
("75", "821.1"),
348+
("xs65-75", "821.1"),
349+
("xs65", "75"),
347350
])
348351
@pytest.mark.parametrize("firmware", ("uefi", "bios", "bios+dell", "bios+mbr"))
349352
@pytest.mark.continuation_of(
@@ -374,11 +377,14 @@ def test_upgrade(self, vm_booted_with_installer, install_disk,
374377
"80-83nightly",
375378
"ch821.1-83nightly",
376379
"xs8-83nightly",
380+
"xs65-75-821.1-83nightly",
377381
"830net-830net",
378382
"82nightly-82nightly",
379383
"821.1-82nightly",
380384
"821.1-821.1",
381385
"75-821.1",
386+
"xs65-75-821.1",
387+
"xs65-75",
382388
))
383389
@pytest.mark.parametrize("firmware", ("uefi", "bios", "bios+dell", "bios+mbr"))
384390
@pytest.mark.continuation_of(

0 commit comments

Comments
 (0)