test: move the env_id prefix to the st_core fixture

This centralizes some of the logic in a single place so it does not have
to be repeated for each test.

Signed-off-by: Pablo Barbáchano <pablob@amazon.com>

Author: pb8o

tests/integration_tests/performance/conftest.py

@@ -85,13 +85,15 @@ def send_metrics(metrics, stats: core.Core):
 def st_core(metrics, results_file_dumper, guest_kernel, rootfs, request):
     """Helper fixture to dump results and publish metrics"""
     stats = core.Core()
+    guest_kernel_ver = guest_kernel.prop
     stats.check_baseline = request.config.getoption("--perf-fail")
+    stats.env_id_prefix = f"{guest_kernel_ver}/{rootfs.name()}"
     stats.iterations = 1
     stats.custom = {
         "instance": global_props.instance,
         "cpu_model": global_props.cpu_model,
         "host_kernel": "linux-" + global_props.host_linux_version,
-        "guest_kernel": guest_kernel.prop,
+        "guest_kernel": guest_kernel_ver,
         "rootfs": rootfs.name(),
     }
     stats.metrics = metrics

tests/integration_tests/performance/test_block_performance.py

@@ -285,7 +285,7 @@ def test_block_performance(
         }
     )
 
-    env_id = f"{guest_kernel.name()}/{rootfs.name()}/{io_engine.lower()}_{microvm_cfg}"
+    env_id = f"{st_core.env_id_prefix}/{io_engine.lower()}_{microvm_cfg}"
 
     fio_id = f"{fio_mode}-bs{fio_block_size}"
     st_prod = st.producer.LambdaProducer(

tests/integration_tests/performance/test_network_latency.py

@@ -133,7 +133,7 @@ def test_network_latency(
 
     raw_baselines = json.loads(CONFIG_NAME_ABS.read_text("utf-8"))
 
-    env_id = f"{guest_kernel.name()}/{rootfs.name()}/{guest_config}"
+    env_id = f"{st_core.env_id_prefix}/{guest_config}"
     cons = consumer.LambdaConsumer(
         metadata_provider=DictMetadataProvider(
             measurements=raw_baselines["measurements"],

tests/integration_tests/performance/test_network_tcp_throughput.py

@@ -159,7 +159,7 @@ def test_network_tcp_throughput(
         payload_length,
         current_avail_cpu + 1,
         DEFAULT_HOST_IP,
-        f"{guest_kernel.name()}/{rootfs.name()}/{microvm_cfg}",
+        f"{st_core.env_id_prefix}/{microvm_cfg}",
     )
     st_core.add_pipe(prod, cons, tag)
 

tests/integration_tests/performance/test_snapshot_restore_performance.py

@@ -213,7 +213,7 @@ def test_snapshot_scaling(
         pytest.skip()
 
     guest_config = f"{vcpus}vcpu_{mem}mb"
-    env_id = f"{guest_kernel.name()}/{rootfs.name()}/{guest_config}"
+    env_id = f"{st_core.env_id_prefix}/{guest_config}"
     st_prod = st.producer.LambdaProducer(
         func=get_snap_restore_latency,
         func_kwargs={
@@ -244,7 +244,7 @@ def test_snapshot_all_devices(
         pytest.skip()
 
     guest_config = "all_dev"
-    env_id = f"{guest_kernel.name()}/{rootfs.name()}/{guest_config}"
+    env_id = f"{st_core.env_id_prefix}/{guest_config}"
     st_prod = st.producer.LambdaProducer(
         func=get_snap_restore_latency,
         func_kwargs={

tests/integration_tests/performance/test_vsock_throughput.py

@@ -175,7 +175,7 @@ def test_vsock_throughput(
     cons, prod, tag = pipe(
         vm,
         current_avail_cpu + 1,
-        f"{guest_kernel.name()}/{rootfs.name()}/{guest_config}",
+        f"{st_core.env_id_prefix}/{guest_config}",
         mode,
         payload_length,
     )