Skip to content

tests: Report kernels newer than 6.12 as next #5116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2025
Merged

tests: Report kernels newer than 6.12 as next #5116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/framework/microvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
7 changes: 7 additions & 0 deletions tests/framework/properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ 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?"""
Expand Down
2 changes: 1 addition & 1 deletion tests/host_tools/fcmetrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:],
}
)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests/performance/test_boottime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}


Expand Down