tests: Mark kernels newer than 6.12 as next

To make it easier to track the upstream kernels which may change as we
rebase, let's mark kernels newer than 6.12 as next for now to make
dashboarding easier.

Signed-off-by: Jack Thomson <[email protected]>

Author: JackThomson2

tests/conftest.py

@@ -133,20 +133,20 @@ def pytest_runtest_logreport(report):
             "test": report.nodeid,
             "instance": global_props.instance,
             "cpu_model": global_props.cpu_model,
-            "host_kernel": "linux-" + global_props.host_linux_version,
+            "host_kernel": "linux-" + global_props.host_linux_version_metrics,
             "phase": report.when,
         },
         # per test
         {
             "test": report.nodeid,
             "instance": global_props.instance,
             "cpu_model": global_props.cpu_model,
-            "host_kernel": "linux-" + global_props.host_linux_version,
+            "host_kernel": "linux-" + global_props.host_linux_version_metrics,
         },
         # per phase
         {"phase": report.when},
         # per host kernel
-        {"host_kernel": "linux-" + global_props.host_linux_version},
+        {"host_kernel": "linux-" + global_props.host_linux_version_metrics},
         # per CPU
         {"cpu_model": global_props.cpu_model},
         # and global

tests/framework/microvm.py

@@ -457,7 +457,7 @@ def dimensions(self):
         return {
             "instance": global_props.instance,
             "cpu_model": global_props.cpu_model,
-            "host_kernel": f"linux-{global_props.host_linux_version}",
+            "host_kernel": f"linux-{global_props.host_linux_version_metrics}",
             "guest_kernel": self.kernel_file.stem[2:],
             "rootfs": self.rootfs_file.name,
             "vcpus": str(self.vcpus_count),

tests/framework/properties.py

@@ -102,6 +102,15 @@ def host_linux_version_tpl(self):
         """Host Linux version major.minor, as a tuple for easy comparison"""
         return tuple(int(x) for x in self.host_linux_version.split("."))
 
+    @property
+    def host_linux_version_metrics(self):
+        """Host Linux version to be reported in metrics"""
+        return (
+            "next"
+            if self.host_linux_version_tpl > (6, 12)
+            else self.host_linux_version
+        )
+
     @property
     def is_ec2(self):
         """Are we running on an EC2 instance?"""

tests/host_tools/fcmetrics.py

@@ -508,7 +508,7 @@ def __init__(self, vm, timer=60):
         self.metrics_logger.set_dimensions(
             {
                 "instance": global_props.instance,
-                "host_kernel": "linux-" + global_props.host_linux_version,
+                "host_kernel": "linux-" + global_props.host_linux_version_metrics,
                 "guest_kernel": vm.kernel_file.stem[2:],
             }
         )

tests/integration_tests/performance/test_boottime.py

@@ -23,7 +23,7 @@
     "instance": global_props.instance,
     "cpu_model": global_props.cpu_model,
     "host_os": global_props.host_os,
-    "host_kernel": "linux-" + global_props.host_linux_version,
+    "host_kernel": "linux-" + global_props.host_linux_version_metrics,
 }