tests: Test OVMF with Linux guest

Extending the test_simple_launch() integration test to validate Cloud
Hypervisor boots correctly with both rust-hypervisor-fw and OVMF on
x86_64 platforms.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>

Jenkinsfile

@@ -25,12 +25,26 @@ pipeline{
             parallel {
 				stage ('Worker build') {
 					agent { node { label 'impish' } }
+					environment {
+        					AZURE_CONNECTION_STRING = credentials('46b4e7d6-315f-4cc1-8333-b58780863b9b')
+					}
 					stages {
 						stage ('Checkout') {
 							steps {
 								checkout scm
 							}
 						}
+						stage ('Install azure-cli') {
+							steps {
+								installAzureCli()
+							}
+						}
+						stage ('Download assets') {
+							steps {
+								sh "mkdir ${env.HOME}/workloads"
+								sh 'az storage blob download --container-name private-images --file "$HOME/workloads/OVMF-83041af43c.fd" --name OVMF-83041af43c.fd --connection-string "$AZURE_CONNECTION_STRING"'
+							}
+						}
 						stage ('Run OpenAPI tests') {
 							steps {
 								sh "scripts/run_openapi_tests.sh"
@@ -84,12 +98,26 @@ pipeline{
 				}
 				stage ('Worker build (musl)') {
 					agent { node { label 'impish' } }
+					environment {
+        					AZURE_CONNECTION_STRING = credentials('46b4e7d6-315f-4cc1-8333-b58780863b9b')
+					}
 					stages {
 						stage ('Checkout') {
 							steps {
 								checkout scm
 							}
 						}
+						stage ('Install azure-cli') {
+							steps {
+								installAzureCli()
+							}
+						}
+						stage ('Download assets') {
+							steps {
+								sh "mkdir ${env.HOME}/workloads"
+								sh 'az storage blob download --container-name private-images --file "$HOME/workloads/OVMF-83041af43c.fd" --name OVMF-83041af43c.fd --connection-string "$AZURE_CONNECTION_STRING"'
+							}
+						}
 						stage ('Run unit tests for musl') {
 							steps {
 								sh "scripts/dev_cli.sh tests --unit --libc musl"
@@ -191,11 +219,7 @@ pipeline{
 						}
 						stage ('Install azure-cli') {
 							steps {
-								sh "sudo apt install -y ca-certificates curl apt-transport-https lsb-release gnupg"
+								installAzureCli()
-								sh "curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null"
-								sh "echo \"deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ hirsute main\" | sudo tee /etc/apt/sources.list.d/azure-cli.list"
-								sh "sudo apt update"
-								sh "sudo apt install -y azure-cli"
 							}
 						}
 						stage ('Download assets') {
@@ -286,3 +310,11 @@ def cancelPreviousBuilds() {
 			}
 		}
 }
+
+def installAzureCli() {
+	sh "sudo apt install -y ca-certificates curl apt-transport-https lsb-release gnupg"
+	sh "curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null"
+	sh "echo \"deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ hirsute main\" | sudo tee /etc/apt/sources.list.d/azure-cli.list"
+	sh "sudo apt update"
+	sh "sudo apt install -y azure-cli"
+}

test_infra/src/lib.rs

@@ -138,6 +138,7 @@ pub trait DiskConfig {
     fn disk(&self, disk_type: DiskType) -> Option<String>;
 }
 
+#[derive(Clone)]
 pub struct UbuntuDiskConfig {
     osdisk_path: String,
     cloudinit_path: String,

tests/integration.rs

@@ -480,10 +480,13 @@ mod tests {
         }
     }
 
-    impl Guest {
+    enum FwType {
-        fn new_from_ip_range(mut disk_config: Box<dyn DiskConfig>, class: &str, id: u8) -> Self {
+        Ovmf,
-            let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap();
+        RustHypervisorFirmware,
+    }
 
+    impl Guest {
+        fn fw_path(fw_type: FwType) -> String {
             let mut workload_path = dirs::home_dir().unwrap();
             workload_path.push("workloads");
 
@@ -491,8 +494,19 @@ mod tests {
             #[cfg(target_arch = "aarch64")]
             fw_path.push("CLOUDHV_EFI.fd");
             #[cfg(target_arch = "x86_64")]
-            fw_path.push("hypervisor-fw");
+            {
-            let fw_path = String::from(fw_path.to_str().unwrap());
+                match fw_type {
+                    FwType::Ovmf => fw_path.push(OVMF_NAME),
+                    FwType::RustHypervisorFirmware => fw_path.push("hypervisor-fw"),
+                }
+            }
+
+            fw_path.to_str().unwrap().to_string()
+        }
+
+        fn new_from_ip_range(mut disk_config: Box<dyn DiskConfig>, class: &str, id: u8) -> Self {
+            let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap();
+
             let network = GuestNetworkConfig {
                 guest_ip: format!("{}.{}.2", class, id),
                 l2_guest_ip1: format!("{}.{}.3", class, id),
@@ -511,7 +525,7 @@ mod tests {
             Guest {
                 tmp_dir,
                 disk_config,
-                fw_path,
+                fw_path: Self::fw_path(FwType::RustHypervisorFirmware),
                 network,
             }
         }
@@ -2365,12 +2379,18 @@ mod tests {
             vec![Box::new(bionic), Box::new(focal)]
                 .drain(..)
                 .for_each(|disk_config| {
-                    let guest = Guest::new(disk_config);
+                    vec![
+                        Guest::fw_path(FwType::Ovmf),
+                        Guest::fw_path(FwType::RustHypervisorFirmware),
+                    ]
+                    .drain(..)
+                    .for_each(|fw_path| {
+                        let guest = Guest::new(disk_config.clone());
 
                         let mut child = GuestCommand::new(&guest)
                             .args(&["--cpus", "boot=1"])
                             .args(&["--memory", "size=512M"])
-                        .args(&["--kernel", guest.fw_path.as_str()])
+                            .args(&["--kernel", fw_path.as_str()])
                             .default_disks()
                             .default_net()
                             .args(&["--serial", "tty", "--console", "off"])
@@ -2385,7 +2405,10 @@ mod tests {
                             assert_eq!(guest.get_initial_apicid().unwrap_or(1), 0);
                             assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
                             assert!(guest.get_entropy().unwrap_or_default() >= 900);
-                        assert_eq!(guest.get_pci_bridge_class().unwrap_or_default(), "0x060000");
+                            assert_eq!(
+                                guest.get_pci_bridge_class().unwrap_or_default(),
+                                "0x060000"
+                            );
                         });
 
                         let _ = child.kill();
@@ -2393,6 +2416,7 @@ mod tests {
 
                         handle_child_output(r, &output);
                     });
+                });
         }
 
         #[test]