kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Replace last vestiges of focal use with jammy

Browse Source 
Focal has served us well for many years but is now beyond EOL. Remove
all remaining use of focal images from the CI.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-05-08 12:02:51 +01:00
parent 1b5c6d9977
commit 55adcc27da
13 changed files with 70 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
performance-metrics/src/performance_tests.rs
View File

@@ -13,9 +13,6 @@ use thiserror::Error;
use crate::{ImageFormat, PerformanceTestControl, PerformanceTestOverrides, mean};
#[cfg(target_arch = "aarch64")]
pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0-update-tool.raw";
#[allow(dead_code)]
#[derive(Error, Debug)]
enum Error {
@@ -138,8 +135,8 @@ pub fn performance_net_throughput(control: &PerformanceTestControl) -> f64 {
let test_timeout = control.test_timeout;
let (rx, bandwidth) = control.net_control.unwrap();
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let mut guest = performance_test_new_guest(Box::new(focal), control);
let jammy = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
let mut guest = performance_test_new_guest(Box::new(jammy), control);
let num_queues = control.num_queues.unwrap();
let queue_size = control.queue_size.unwrap();
@@ -178,8 +175,8 @@ pub fn performance_net_throughput(control: &PerformanceTestControl) -> f64 {
}
pub fn performance_net_latency(control: &PerformanceTestControl) -> f64 {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let mut guest = performance_test_new_guest(Box::new(focal), control);
let jammy = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
let mut guest = performance_test_new_guest(Box::new(jammy), control);
let num_queues = control.num_queues.unwrap();
let queue_size = control.queue_size.unwrap();
@@ -325,8 +322,8 @@ fn measure_boot_time(cmd: &mut GuestCommand, test_timeout: u32) -> Result<f64, E
pub fn performance_boot_time(control: &PerformanceTestControl) -> f64 {
let r = std::panic::catch_unwind(|| {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let guest = performance_test_new_guest(Box::new(focal), control);
let jammy = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
let guest = performance_test_new_guest(Box::new(jammy), control);
let mut cmd = GuestCommand::new(&guest);
let c = cmd
@@ -349,8 +346,8 @@ pub fn performance_boot_time(control: &PerformanceTestControl) -> f64 {
pub fn performance_boot_time_pmem(control: &PerformanceTestControl) -> f64 {
let r = std::panic::catch_unwind(|| {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let guest = performance_test_new_guest(Box::new(focal), control);
let jammy = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
let guest = performance_test_new_guest(Box::new(jammy), control);
let mut cmd = GuestCommand::new(&guest);
let c = cmd
.default_cpus()
@@ -387,8 +384,8 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
let bandwidth = block_control.bandwidth;
let test_file = block_control.test_file;
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let mut guest = performance_test_new_guest(Box::new(focal), control);
let jammy = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
let mut guest = performance_test_new_guest(Box::new(jammy), control);
let api_socket = guest
.tmp_dir
.as_path()
@@ -528,8 +525,8 @@ fn measure_restore_time(
pub fn performance_restore_latency(control: &PerformanceTestControl) -> f64 {
let r = std::panic::catch_unwind(|| {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let guest = performance_test_new_guest(Box::new(focal), control);
let jammy = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
let guest = performance_test_new_guest(Box::new(jammy), control);
let api_socket_source = String::from(
guest
.tmp_dir