install: 7.5, 7.6, and XS 7.0

No direct upgrade to 8.3 for those versions.

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

data.py-dist

@@ -134,6 +134,8 @@ ISO_IMAGES: Dict[str, "IsoImageDef"] = {
     '820': {'path': "8.2/xcp-ng-8.2.0.iso"},
     '81': {'path': "8.1/xcp-ng-8.1.0-2.iso"},
     '80': {'path': "8.0/xcp-ng-8.0.0.iso"},
+    '76': {'path': "7.6/xcp-ng-7.6.0.iso"},
+    '75': {'path': "7.5/xcp-ng-7.5.0-2.iso"},
     'xs8': {'path': "XenServer8_2024-03-18.iso"},
     'ch821.1': {'path': "CitrixHypervisor-8.2.1-2306-install-cd.iso"},
     'ch821': {'path': "CitrixHypervisor-8.2.1-install-cd.iso"},

tests/install/test.py

@@ -11,15 +11,20 @@
 
 # Requirements:
 # - one XCP-ng host capable of nested virt, with an ISO SR, and a default SR
+# - the "small_vm" ISO must have in authorized_keys a SSH key accepted by the
+#   ssh server in the installed host version (7.x and earlier reject current
+#   ssh-rsa keys, a public ssh-ed25519 key listed in TEST_SSH_PUBKEY should be
+#   there)
 
 @pytest.mark.dependency()
 class TestNested:
     @pytest.mark.parametrize("iso_version", (
         "83nightly",
         "83rc1", "83b2", "83b1",
         "821.1",
-        "81", "80",
+        "81", "80", "76", "75",
         "xs8", "ch821.1",
+        "xs70",
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.vm_definitions(
@@ -70,8 +75,11 @@ def _test_firstboot(self, create_vms, mode, is_restore=False):
         else:
             expected_rel_id = split_mode[-1]
         expected_rel = {
+            "xs70": "7.0.0-125380c",
             "ch821.1": "8.2.1",
             "xs8": "8.4.0",
+            "75": "7.5.0",
+            "76": "7.6.0",
             "80": "8.0.0",
             "81": "8.1.0",
             "821.1": "8.2.1",
@@ -129,25 +137,35 @@ def _test_firstboot(self, create_vms, mode, is_restore=False):
                             ]
                 STAMPS_DIR = "/var/lib/misc"
                 STAMPS = [f"ran-{service}" for service in SERVICES]
-            elif lsb_rel in ["8.0.0", "8.1.0"]:
+            elif lsb_rel in ["7.0.0-125380c", "7.5.0", "7.6.0", "8.0.0", "8.1.0"]:
                 SERVICES = ["xs-firstboot"]
                 STAMPS_DIR = "/etc/firstboot.d/state"
                 STAMPS = [
-                    "05-prepare-networking",
                     "10-prepare-storage",
                     "15-set-default-storage",
                     "20-udev-storage",
                     "25-multipath",
                     "40-generate-iscsi-iqn",
                     "50-prepare-control-domain-params",
-                    "60-import-keys",
                     "60-upgrade-likewise-to-pbis",
-                    "62-create-guest-templates",
-                    "80-common-criteria",
                     "90-flush-pool-db",
                     "95-legacy-logrotate",
                     "99-remove-firstboot-flag",
                 ]
+                if lsb_rel in ["7.0.0-125380c"]:
+                    STAMPS += [
+                        "61-regenerate-old-templates",
+                    ]
+                if lsb_rel in ["7.5.0", "7.6.0", "8.0.0", "8.1.0"]:
+                    STAMPS += [
+                        "05-prepare-networking",
+                        "60-import-keys",
+                        "62-create-guest-templates",
+                    ]
+                if lsb_rel in ["8.0.0", "8.1.0"]:
+                    STAMPS += [
+                        "80-common-criteria",
+                    ]
             else:
                 raise AssertionError(f"Unhandled LSB release {lsb_rel!r}")
             # check for firstboot issues
@@ -200,7 +218,9 @@ def _test_firstboot(self, create_vms, mode, is_restore=False):
         "83rc1", "83b2", "83b1",
         "821.1",
         "81", "80",
+        "76", "75",
         "xs8", "ch821.1",
+        "xs70",
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(