chore(tests): configure kernel/rootfs in microvm_factory fixture

- Make simple the common case of "run this kernel/rootfs"
- Cleanup VMs automatically during test teardown
- Some artifacts fixes to make it work

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/conftest.py

@@ -451,13 +451,32 @@ class MicroVMFactory:
         def __init__(self, tmp_path, bin_cloner):
             self.tmp_path = tmp_path
             self.bin_cloner_path = bin_cloner
+            self.vms = []
 
-        def build(self):
+        def build(self, kernel=None, rootfs=None):
             """Build a fresh microvm."""
             vm = init_microvm(self.tmp_path, self.bin_cloner_path)
+            self.vms.append(vm)
+            if kernel is not None:
+                kernel_path = Path(kernel.local_path())
+                vm.kernel_file = kernel_path
+            if rootfs is not None:
+                rootfs_path = Path(rootfs.local_path())
+                rootfs_path2 = Path(vm.path) / rootfs_path.name
+                # TBD only iff ext4 / rw
+                shutil.copyfile(rootfs_path, rootfs_path2)
+                vm.rootfs_file = rootfs_path2
+                vm.ssh_config["ssh_key_path"] = rootfs.ssh_key().local_path()
             return vm
 
-    yield MicroVMFactory(tmp_path, bin_cloner_path)
+        def kill(self):
+            """Clean up all built VMs"""
+            for vm in self.vms:
+                vm.kill()
+
+    uvm_factory = MicroVMFactory(tmp_path, bin_cloner_path)
+    yield uvm_factory
+    uvm_factory.kill()
 
 
 @pytest.fixture(params=MICROVM_S3_FETCHER.list_microvm_images(capability_filter=["*"]))
@@ -602,6 +621,25 @@ def pytest_generate_tests(metafunc):
         )
 
 
+@pytest.fixture(params=ARTIFACTS_COLLECTION.kernels(), ids=lambda kernel: kernel.name())
+def guest_kernel(request):
+    """Return all supported guest kernels."""
+    kernel = request.param
+    kernel.download()
+    return kernel
+
+
+@pytest.fixture(
+    params=ARTIFACTS_COLLECTION.disks("ubuntu"), ids=lambda rootfs: rootfs.name()
+)
+def rootfs(request):
+    """Return all supported rootfs."""
+    rootfs = request.param
+    rootfs.download()
+    rootfs.ssh_key().download()
+    return rootfs
+
+
 TEST_MICROVM_CAP_FIXTURE_TEMPLATE = (
     "@pytest.fixture("
     "    params=MICROVM_S3_FETCHER.list_microvm_images(\n"

tests/framework/artifacts.py

@@ -93,11 +93,12 @@ def download(self, target_folder=ARTIFACTS_LOCAL_ROOT, force=False):
         """Save the artifact in the folder specified target_path."""
         assert self.bucket is not None
         self._local_folder = target_folder
-        Path(self.local_dir()).mkdir(parents=True, exist_ok=True)
-        if force or not os.path.exists(self.local_path()):
-            self._bucket.download_file(self._key, self.local_path())
+        local_path = Path(self.local_path())
+        local_path.parent.mkdir(parents=True, exist_ok=True)
+        if force or not local_path.exists():
+            self._bucket.download_file(self._key, local_path)
             # Artifacts are read-only by design.
-            os.chmod(self.local_path(), S_IREAD)
+            local_path.chmod(0o400)
 
     def local_path(self):
         """Return the local path where the file was downloaded."""
@@ -273,7 +274,12 @@ def ssh_key(self):
         """Return a ssh key artifact."""
         # Replace extension.
         key_file_path = str(Path(self.key).with_suffix(".id_rsa"))
-        return Artifact(self.bucket, key_file_path, artifact_type=ArtifactType.SSH_KEY)
+        return Artifact(
+            self.bucket,
+            key_file_path,
+            artifact_type=ArtifactType.SSH_KEY,
+            local_folder=self._local_folder,
+        )
 
 
 class FirecrackerArtifact(Artifact):