WIP indirect upgrade from XS 6.5

xcp-ng · Oct 18, 2024 · 9b67a2e · 9b67a2e
1 parent 04c7d90
commit 9b67a2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/config.py b/lib/config.py
@@ -65,4 +65,8 @@ def sr_device_config(datakey, *, required=[]):
     install.test::Nested::boot_inst[uefi-xs8-host1-iso-ext]
     install.test::Nested::boot_inst[uefi-xs8-host2-iso-ext]
     """.split()
+} | {
+    f"{x}-vm1": f"{x}-vm1-72f98fabd4f5506cb5f2f8c0a59cbcf5af7a478f" for x in """
+    install.test::Nested::boot_inst[bios-xs65-host1-iso-nosr]
+    """.split()
 }
diff --git a/tests/install/test.py b/tests/install/test.py
@@ -337,11 +337,14 @@ def test_boot_inst(self, create_vms,
         ("81", "83nightly"),
         ("80", "83nightly"),
         ("75-821.1", "83nightly"),
+        ("xs65-75-821.1", "83nightly"),
         ("xs8", "83nightly"),
         ("ch821.1", "83nightly"),
         ("83rcnet", "83rcnet"), # FIXME
         ("821.1", "821.1"),
         ("75", "821.1"),
+        ("xs65-75", "821.1"),
+        ("xs65", "75"),
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios", "bios+dell", "bios+mbr"))
     @pytest.mark.continuation_of(
@@ -374,9 +377,12 @@ def test_upgrade(self, vm_booted_with_installer, install_disk,
         "80-83nightly",
         "ch821.1-83nightly",
         "xs8-83nightly",
+        "xs65-75-821.1-83nightly",
         "83rcnet-83rcnet",
         "821.1-821.1",
         "75-821.1",
+        "xs65-75-821.1",
+        "xs65-75",
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios", "bios+dell", "bios+mbr"))
     @pytest.mark.continuation_of(