install: produce several hosts from single install

This is just base infra, different machines have not differences yet.

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

Author: ydirson

tests/install/test-sequences/inst+upg.lst

@@ -1,2 +1,2 @@
-tests/install/test.py::TestNested::test_upgrade[uefi-83nightly-83nightly]
-tests/install/test.py::TestNested::test_boot_upg[uefi-83nightly-83nightly]
+tests/install/test.py::TestNested::test_upgrade[uefi-83nightly-83nightly-host1]
+tests/install/test.py::TestNested::test_boot_upg[uefi-83nightly-83nightly-host1]

tests/install/test-sequences/inst.lst

@@ -1,2 +1,2 @@
 tests/install/test.py::TestNested::test_install[uefi-83nightly]
-tests/install/test.py::TestNested::test_boot_inst[uefi-83nightly]
+tests/install/test.py::TestNested::test_boot_inst[uefi-83nightly-host1]

tests/install/test.py

@@ -213,6 +213,7 @@ def _test_firstboot(self, create_vms, mode, is_restore=False):
             raise
 
     @pytest.mark.usefixtures("xcpng_chained")
+    @pytest.mark.parametrize("machine", ("host1", "host2"))
     @pytest.mark.parametrize("version", (
         "83nightly",
         "83rc1", "83b2", "83b1",
@@ -227,10 +228,11 @@ def _test_firstboot(self, create_vms, mode, is_restore=False):
         lambda firmware, version: [
             dict(vm="vm1", image_test=f"TestNested::test_install[{firmware}-{version}]")])
     def test_boot_inst(self, create_vms,
-                       firmware, version):
+                       firmware, version, machine):
         self._test_firstboot(create_vms, version)
 
     @pytest.mark.usefixtures("xcpng_chained")
+    @pytest.mark.parametrize("machine", ("host1", "host2"))
     @pytest.mark.parametrize("mode", (
         "83nightly-83nightly",
         "83rc1-83nightly",
@@ -245,11 +247,11 @@ def test_boot_inst(self, create_vms,
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, mode: [dict(
+        lambda firmware, mode, machine: [dict(
             vm="vm1",
-            image_test=(f"TestNested::test_upgrade[{firmware}-{mode}]"))])
+            image_test=(f"TestNested::test_upgrade[{firmware}-{mode}-{machine}]"))])
     def test_boot_upg(self, create_vms,
-                      firmware, mode):
+                      firmware, mode, machine):
         self._test_firstboot(create_vms, mode)
 
     @pytest.mark.usefixtures("xcpng_chained")
@@ -275,6 +277,7 @@ def test_boot_rst(self, create_vms,
         self._test_firstboot(create_vms, mode, is_restore=True)
 
     @pytest.mark.usefixtures("xcpng_chained")
+    @pytest.mark.parametrize("machine", ("host1", "host2"))
     @pytest.mark.parametrize(("orig_version", "iso_version"), [
         ("83nightly", "83nightly"),
         ("83rc1", "83nightly"),
@@ -289,17 +292,17 @@ def test_boot_rst(self, create_vms,
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, orig_version: [dict(
+        lambda firmware, orig_version, machine: [dict(
             vm="vm1",
-            image_test=f"TestNested::test_boot_inst[{firmware}-{orig_version}]")])
+            image_test=f"TestNested::test_boot_inst[{firmware}-{orig_version}-{machine}]")])
     @pytest.mark.answerfile(
         lambda install_disk: AnswerFile("UPGRADE").top_append(
             {"TAG": "source", "type": "local"},
             {"TAG": "existing-installation",
              "CONTENTS": install_disk},
         ))
     def test_upgrade(self, vm_booted_with_installer, install_disk,
-                     firmware, orig_version, iso_version):
+                     firmware, orig_version, iso_version, machine):
         host_vm = vm_booted_with_installer
         installer.monitor_upgrade(ip=host_vm.ip)
 
@@ -320,7 +323,7 @@ def test_upgrade(self, vm_booted_with_installer, install_disk,
     @pytest.mark.continuation_of(
         lambda firmware, orig_version: [dict(
             vm="vm1",
-            image_test=f"TestNested::test_boot_upg[{firmware}-{orig_version}]")])
+            image_test=f"TestNested::test_boot_upg[{firmware}-{orig_version}-host1]")])
     @pytest.mark.answerfile(
         lambda install_disk: AnswerFile("RESTORE").top_append(
             {"TAG": "backup-disk",