Merge branch 'main' into aarch64-max-dev

Author: roypat

tests/framework/microvm.py

@@ -1206,13 +1206,20 @@ def build_n_from_snapshot(
         uffd_handler_name=None,
         incremental=False,
         use_snapshot_editor=True,
+        no_netns_reuse=False,
     ):
         """A generator of `n` microvms restored, either all restored from the same given snapshot
         (incremental=False), or created by taking successive snapshots of restored VMs
         """
         last_snapshot = None
         for _ in range(nr_vms):
-            microvm = self.build()
+            microvm = self.build(
+                **(
+                    {"netns": net_tools.NetNs(str(uuid.uuid4()))}
+                    if no_netns_reuse
+                    else {}
+                )
+            )
             microvm.spawn()
 
             snapshot_copy = microvm.restore_from_snapshot(

tests/integration_tests/performance/test_jailer.py

@@ -52,6 +52,7 @@ def test_jailer_startup(
         {
             "instance": global_props.instance,
             "cpu_model": global_props.cpu_model,
+            "host_kernel": f"linux-{global_props.host_linux_version}",
             "performance_test": "test_jailer_startup",
             "parallel": str(parallel),
             "mounts": str(mounts),

tests/integration_tests/performance/test_snapshot.py

@@ -122,7 +122,9 @@ def test_restore_latency(
 
     snapshot = vm.snapshot_full()
     vm.kill()
-    for microvm in microvm_factory.build_n_from_snapshot(snapshot, ITERATIONS):
+    for microvm in microvm_factory.build_n_from_snapshot(
+        snapshot, ITERATIONS, no_netns_reuse=True
+    ):
         value = 0
         # Parse all metric data points in search of load_snapshot time.
         microvm.flush_metrics()