WIP install: add XS/CH support

Author: ydirson

tests/install/test.py

@@ -16,11 +16,19 @@
 
 @pytest.mark.dependency()
 class TestNested:
-    @pytest.mark.parametrize("iso_version", ("821.1", "83b2"))
+    @pytest.mark.parametrize("iso_version", (
+        "ch821.1", "xs8",
+        "821.1", "83b2",
+    ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
-    @pytest.mark.installer_iso(lambda version: {"821.1": "xcpng-8.2.1-2023",
-                                                "83b2": "xcpng-8.3-beta2"}[version],
-                               param_mapping={"version": "iso_version"})
+    @pytest.mark.installer_iso(
+        lambda version: {
+            "821.1": "xcpng-8.2.1-2023",
+            "83b2": "xcpng-8.3-beta2",
+            "ch821.1": "ch-8.2.1-23",
+            "xs8": "xs8-2024-03",
+        }[version],
+        param_mapping={"version": "iso_version"})
     @pytest.mark.vm_definitions(lambda firmware: dict(
         name="vm 1",
         template="Other install media",
@@ -136,12 +144,15 @@ def test_install(self, request, firmware, iso_version, iso_remaster, create_vms)
     @pytest.mark.usefixtures("xcpng_chained")
     # FIXME take "uefi" outa here and allow "bios"
     @pytest.mark.parametrize("mode", [
+        "ch821.1", "xs8",
         "821.1",
         "821.1-821.1",
         "83b2",
         "821.1-83b2",
+        "ch821.1-83b2",
         #"83b2-83b2", # 8.3b2 disabled the upgrade from 8.3
         "821.1-83b2-83b2",
+        "ch821.1-83b2-83b2",
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
@@ -161,7 +172,12 @@ def test_firstboot(self, firmware, request, create_vms, mode):
         logging.info("Host VM has MAC %s", mac_address)
 
         # determine version info from `mode`
-        expected_dist = "XCP-ng"
+        if mode.startswith("xs"):
+            expected_dist = "XenServer"
+        elif mode.startswith("ch"):
+            expected_dist = "CitrixHypervisor"
+        else:
+            expected_dist = "XCP-ng"
         # succession of insta/upg/rst operations
         split_mode = mode.split("-")
         if len(split_mode) == 3:
@@ -170,6 +186,8 @@ def test_firstboot(self, firmware, request, create_vms, mode):
         else:
             expected_rel_id = split_mode[-1]
         expected_rel = {
+            "ch821.1": "8.2.1",
+            "xs8": "8.4.0",
             "821.1": "8.2.1",
             "83b2": "8.3.0",
         }[expected_rel_id]
@@ -280,6 +298,7 @@ def test_firstboot(self, firmware, request, create_vms, mode):
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize(("orig_version", "iso_version"), [
         ("821.1", "821.1"),
+        ("ch821.1", "83b2"),
         ("821.1", "83b2"),
         #("83b2", "83b2"), # 8.3b2 disabled the upgrade from 8.3
     ])
@@ -387,6 +406,7 @@ def test_upgrade(self, request, firmware, orig_version, iso_version, iso_remaste
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize(("orig_version", "iso_version"), [
         ("821.1-83b2", "83b2"),
+        ("ch821.1-83b2", "83b2"),
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(