External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Update for new VFIO worker

Browse Source 
Adjust the VFIO device path and the disk image based on the new VFIO CI
worker.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford 2024-10-12 17:59:23 +01:00
parent 79ccb25f78
commit 81db2f0233
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test_infra/src/lib.rs
View File

@ -1128,7 +1128,10 @@ impl Guest {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
pub fn check_nvidia_gpu(&self) { pub fn check_nvidia_gpu(&self) {
assert!(self.ssh_command("nvidia-smi").unwrap().contains("Tesla T4")); assert!(self
.ssh_command("nvidia-smi")
.unwrap()
.contains("NVIDIA L40S"));
} }
pub fn reboot_linux(&self, current_reboot_count: u32, custom_timeout: Option<i32>) { pub fn reboot_linux(&self, current_reboot_count: u32, custom_timeout: Option<i32>) {

16
tests/integration.rs
View File

@ -32,7 +32,8 @@ const MAX_NUM_PCI_SEGMENTS: u16 = 96;
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
mod x86_64 { mod x86_64 {
pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-0.raw"; pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-0.raw";
pub const JAMMY_NVIDIA_IMAGE_NAME: &str = "jammy-server-cloudimg-amd64-nvidia.raw"; pub const JAMMY_VFIO_IMAGE_NAME: &str =
"jammy-server-cloudimg-amd64-custom-vfio-20241012-0.raw";
pub const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-amd64-custom-20210609-0.qcow2"; pub const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-amd64-custom-20210609-0.qcow2";
pub const FOCAL_IMAGE_NAME_QCOW2_BACKING_FILE: &str = pub const FOCAL_IMAGE_NAME_QCOW2_BACKING_FILE: &str =
"focal-server-cloudimg-amd64-custom-20210609-0-backing.qcow2"; "focal-server-cloudimg-amd64-custom-20210609-0-backing.qcow2";
@ -8997,9 +8998,10 @@ mod sgx {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
mod vfio { mod vfio {
use crate::*; use crate::*;
const NVIDIA_VFIO_DEVICE: &str = "/sys/bus/pci/devices/0002:00:01.0";
fn test_nvidia_card_memory_hotplug(hotplug_method: &str) { fn test_nvidia_card_memory_hotplug(hotplug_method: &str) {
let jammy = UbuntuDiskConfig::new(JAMMY_NVIDIA_IMAGE_NAME.to_string()); let jammy = UbuntuDiskConfig::new(JAMMY_VFIO_IMAGE_NAME.to_string());
let guest = Guest::new(Box::new(jammy)); let guest = Guest::new(Box::new(jammy));
let api_socket = temp_api_path(&guest.tmp_dir); let api_socket = temp_api_path(&guest.tmp_dir);
@ -9010,7 +9012,7 @@ mod vfio {
format!("size=4G,hotplug_size=4G,hotplug_method={hotplug_method}").as_str(), format!("size=4G,hotplug_size=4G,hotplug_method={hotplug_method}").as_str(),
]) ])
.args(["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()]) .args(["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()])
.args(["--device", "path=/sys/bus/pci/devices/0000:31:00.0/"]) .args(["--device", format!("path={NVIDIA_VFIO_DEVICE}").as_str()])
.args(["--api-socket", &api_socket]) .args(["--api-socket", &api_socket])
.default_disks() .default_disks()
.default_net() .default_net()
@ -9053,7 +9055,7 @@ mod vfio {
#[test] #[test]
fn test_nvidia_card_pci_hotplug() { fn test_nvidia_card_pci_hotplug() {
let jammy = UbuntuDiskConfig::new(JAMMY_NVIDIA_IMAGE_NAME.to_string()); let jammy = UbuntuDiskConfig::new(JAMMY_VFIO_IMAGE_NAME.to_string());
let guest = Guest::new(Box::new(jammy)); let guest = Guest::new(Box::new(jammy));
let api_socket = temp_api_path(&guest.tmp_dir); let api_socket = temp_api_path(&guest.tmp_dir);
@ -9075,7 +9077,7 @@ mod vfio {
let (cmd_success, cmd_output) = remote_command_w_output( let (cmd_success, cmd_output) = remote_command_w_output(
&api_socket, &api_socket,
"add-device", "add-device",
Some("id=vfio0,path=/sys/bus/pci/devices/0000:31:00.0/"), Some(format!("id=vfio0,path={NVIDIA_VFIO_DEVICE}").as_str()),
); );
assert!(cmd_success); assert!(cmd_success);
assert!(String::from_utf8_lossy(&cmd_output) assert!(String::from_utf8_lossy(&cmd_output)
@ -9095,7 +9097,7 @@ mod vfio {
#[test] #[test]
fn test_nvidia_card_reboot() { fn test_nvidia_card_reboot() {
let jammy = UbuntuDiskConfig::new(JAMMY_NVIDIA_IMAGE_NAME.to_string()); let jammy = UbuntuDiskConfig::new(JAMMY_VFIO_IMAGE_NAME.to_string());
let guest = Guest::new(Box::new(jammy)); let guest = Guest::new(Box::new(jammy));
let api_socket = temp_api_path(&guest.tmp_dir); let api_socket = temp_api_path(&guest.tmp_dir);
@ -9103,7 +9105,7 @@ mod vfio {
.args(["--cpus", "boot=4"]) .args(["--cpus", "boot=4"])
.args(["--memory", "size=4G"]) .args(["--memory", "size=4G"])
.args(["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()]) .args(["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()])
.args(["--device", "path=/sys/bus/pci/devices/0000:31:00.0/"]) .args(["--device", format!("path={NVIDIA_VFIO_DEVICE}").as_str()])
.args(["--api-socket", &api_socket]) .args(["--api-socket", &api_socket])
.default_disks() .default_disks()
.default_net() .default_net()