Fix boottime tests

Renamed the boottime microvm fixtures, so that the
tests use the old PIO-based boot time notification on x86.

Also created new folders for these fixtures in S3:
old_minimal and old_minimal_with_initrd.

This had to be done because the fixtures were pointing to
artifacts that are used in mainline, with the new MMIO boot-timer
device.

Signed-off-by: alindima <[email protected]>

Author: alindima

tests/integration_tests/performance/test_boottime.py

@@ -22,34 +22,36 @@
 TIMESTAMP_LOG_REGEX = r'Guest-boot-time\s+\=\s+(\d+)\s+us'
 
 
-def test_boottime_no_network(test_microvm_with_boottime):
+def test_boottime_no_network(test_microvm_with_old_boottime):
     """Check guest boottime of microvm without network."""
-    _ = _configure_vm(test_microvm_with_boottime)
+    _ = _configure_vm(test_microvm_with_old_boottime)
     time.sleep(0.4)
-    boottime_us = _test_microvm_boottime(test_microvm_with_boottime.log_data)
+    boottime_us = _test_microvm_boottime(
+        test_microvm_with_old_boottime.log_data)
     print("Boot time with no network is: " + str(boottime_us) + " us")
 
 
 def test_boottime_with_network(
-        test_microvm_with_boottime,
+        test_microvm_with_old_boottime,
         network_config
 ):
     """Check guest boottime of microvm with network."""
-    _tap = _configure_vm(test_microvm_with_boottime, {
+    _tap = _configure_vm(test_microvm_with_old_boottime, {
         "config": network_config, "iface_id": "1"
     })
     time.sleep(0.4)
-    boottime_us = _test_microvm_boottime(test_microvm_with_boottime.log_data)
+    boottime_us = _test_microvm_boottime(
+        test_microvm_with_old_boottime.log_data)
     print("Boot time with network configured is: " + str(boottime_us) + " us")
 
 
 def test_initrd_boottime(
-        test_microvm_with_initrd):
+        test_microvm_with_old_initrd):
     """Check guest boottime of microvm with initrd."""
-    _tap = _configure_vm(test_microvm_with_initrd, initrd=True)
+    _tap = _configure_vm(test_microvm_with_old_initrd, initrd=True)
     time.sleep(0.8)
     boottime_us = _test_microvm_boottime(
-        test_microvm_with_initrd.log_data, max_time_us=INITRD_BOOT_TIME_US)
+        test_microvm_with_old_initrd.log_data, max_time_us=INITRD_BOOT_TIME_US)
     print("Boot time with initrd is: " + str(boottime_us) + " us")