fixup! WIP export to XVA after install, and use it for separate firstboot test

Author: ydirson

conftest.py

@@ -7,7 +7,7 @@
 
 import lib.config as global_config
 
-from lib.common import callable_marker
+from lib.common import callable_marker, shortened_nodeid
 from lib.common import wait_for, vm_image, is_uuid
 from lib.common import setup_formatted_and_mounted_disk, teardown_formatted_and_mounted_disk
 from lib.netutil import is_ipv6
@@ -424,6 +424,13 @@ def create_vms(request, host):
                 _import_vm(vm_def, host, vms, use_cache=CACHE_IMPORTED_VM)
         yield vms
 
+        # record this state
+        for vm_def, vm in zip(vm_defs, vms):
+            # FIXME where to store?
+            xva_name = f"{shortened_nodeid(request.node.nodeid)}-{vm_def['name']}.xva"
+            host.ssh(["rm -f", xva_name])
+            vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)
+
     except Exception:
         logging.error("exception caught...")
         raise

tests/install/conftest.py

@@ -210,10 +210,11 @@ def xcpng_chained(request):
     continuation_of = callable_marker(marker.args[0], request, param_mapping=param_mapping)
 
     vm_defs = [dict(name=vm_spec['vm'],
-                    image=shortened_nodeid(
+                    image="{}-{}.xva".format(shortened_nodeid(
                         _expand_scope_relative_nodeid(vm_spec['test'],
                                                       vm_spec.get("scope", "module"),
                                                       request.node.nodeid)),
+                                         vm_spec['vm'])
                     )
                for vm_spec in continuation_of]
 

tests/install/test.py

@@ -8,12 +8,6 @@
 from lib.host import Host
 from lib.pool import Pool
 
-try:
-    from data import CACHE_IMPORTED_VM
-except ImportError:
-    CACHE_IMPORTED_VM = False
-assert CACHE_IMPORTED_VM in [True, False]
-
 @pytest.mark.dependency()
 class TestNested:
     @pytest.mark.parametrize("iso_version", (
@@ -35,7 +29,7 @@ class TestNested:
         }[version],
         param_mapping={"version": "iso_version"})
     @pytest.mark.vm_definitions(lambda firmware: dict(
-        name="vm 1",
+        name="vm1",
         template="Other install media",
         params=(
             # dict(param_name="", value=""),
@@ -51,7 +45,7 @@ class TestNested:
             ),
             "bios": (),
         }[firmware],
-        vdis=[dict(name="vm 1 system disk", size="100GiB", device="xvda", userdevice="0")],
+        vdis=[dict(name="vm1 system disk", size="100GiB", device="xvda", userdevice="0")],
         vifs=[dict(index=0, network_uuid="eabc1038-e40f-2ae5-0781-a3adbec1cae8")], # FIXME
     ),
                                 param_mapping={"firmware": "firmware"})
@@ -138,14 +132,6 @@ def test_install(self, request, firmware, iso_version, iso_remaster, create_vms)
             host_vm.shutdown(force=True)
             raise
 
-        # record this state
-        # FIXME move to fixture
-        # FIXME where to store?
-        xva_name = shortened_nodeid(request.node.nodeid) + ".xva"
-        host_vm.host.ssh(["rm -f", xva_name])
-        host_vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)
-
-
     @pytest.mark.usefixtures("xcpng_chained")
     # FIXME take "uefi" outa here and allow "bios"
     @pytest.mark.parametrize("mode", [
@@ -164,7 +150,7 @@ def test_install(self, request, firmware, iso_version, iso_remaster, create_vms)
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda params, firmware: [dict(vm="vm 1",
+        lambda params, firmware: [dict(vm="vm1",
                                        test=(f"TestNested::{{}}[{firmware}-{params}]".format(
                                            {
                                                1: "test_install",
@@ -327,13 +313,6 @@ def test_firstboot(self, firmware, request, create_vms, mode):
             host_vm.shutdown(force=True)
             raise
 
-        # record this state
-        # FIXME move to fixture
-        # FIXME where to store?
-        xva_name = shortened_nodeid(request.node.nodeid) + ".xva"
-        host_vm.host.ssh(["rm -f", xva_name])
-        host_vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)
-
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize(("orig_version", "iso_version"), [
         ("821.1", "821.1"),
@@ -347,7 +326,7 @@ def test_firstboot(self, firmware, request, create_vms, mode):
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, params: [dict(vm="vm 1",
+        lambda firmware, params: [dict(vm="vm1",
                                        test=f"TestNested::test_firstboot[{firmware}-{params}]")],
         param_mapping={"params": "orig_version", "firmware": "firmware"},
     )
@@ -439,13 +418,6 @@ def test_upgrade(self, request, firmware, orig_version, iso_version, iso_remaste
             host_vm.shutdown(force=True)
             raise
 
-        # record this state
-        # FIXME move to fixture
-        # FIXME where to store?
-        xva_name = shortened_nodeid(request.node.nodeid) + ".xva"
-        host_vm.host.ssh(["rm -f", xva_name])
-        host_vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)
-
     @pytest.mark.usefixtures("xcpng_chained")
     @pytest.mark.parametrize(("orig_version", "iso_version"), [
         ("821.1-83b2", "83b2"),
@@ -457,7 +429,7 @@ def test_upgrade(self, request, firmware, orig_version, iso_version, iso_remaste
     ])
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, params: [dict(vm="vm 1",
+        lambda firmware, params: [dict(vm="vm1",
                                        test=f"TestNested::test_firstboot[{firmware}-{params}]")],
         param_mapping={"params": "orig_version", "firmware": "firmware"},
     )
@@ -547,10 +519,3 @@ def test_restore(self, request, firmware, orig_version, iso_version, iso_remaste
             # wait_for(lambda: False, 'Wait "forever"', timeout_secs=100*60)
             host_vm.shutdown(force=True)
             raise
-
-        # record this state
-        # FIXME move to fixture
-        # FIXME where to store?
-        xva_name = shortened_nodeid(request.node.nodeid) + ".xva"
-        host_vm.host.ssh(["rm -f", xva_name])
-        host_vm.export(xva_name, "zstd", use_cache=CACHE_IMPORTED_VM)