ch_integration_tests: Rely on upstream Ubuntu focal cloud image

The hypervisor-fw now supports booting upstream Focal images, which is
why we can move to latest ones. The reason for this move is to have
images with a kernel that includes evged driver so that ACPI hotplug can
work for Cloud Hypervisor.

Signed-off-by: Sebastien Boeuf <[email protected]>

Author: Sebastien Boeuf

ch_integration_tests/run_tests.sh

@@ -13,16 +13,16 @@ if [ ! -f "$FW" ]; then
     popd
 fi
 
-FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210106-1.qcow2"
-FOCAL_OS_IMAGE_URL="https://cloudhypervisorstorage.blob.core.windows.net/images/$FOCAL_OS_IMAGE_NAME"
+FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64.img"
+FOCAL_OS_IMAGE_URL="https://cloud-images.ubuntu.com/focal/current/$FOCAL_OS_IMAGE_NAME"
 FOCAL_OS_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_IMAGE" ]; then
     pushd $WORKLOADS_DIR
     time wget --quiet $FOCAL_OS_IMAGE_URL || exit 1
     popd
 fi
 
-FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210106-1.raw"
+FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64.raw"
 FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
     pushd $WORKLOADS_DIR

ch_integration_tests/tests/integration.rs

@@ -21,7 +21,7 @@ mod tests {
     use uuid::Uuid;
     use vmm_sys_util::tempdir::TempDir;
 
-    const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210106-1.raw";
+    const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64.raw";
 
     pub const DEFAULT_TCP_LISTENER_PORT: u16 = 8000;
     const DEFAULT_VCPUS: u8 = 1;
@@ -164,8 +164,10 @@ mod tests {
         }
 
         fn wait_vm_boot(&self, custom_timeout: Option<i32>) -> Result<(), Error> {
+            // Focal image requires more than default 80s to boot, that's why
+            // we set the default to 120s.
             self.network
-                .wait_vm_boot(custom_timeout)
+                .wait_vm_boot(custom_timeout.or(Some(120)))
                 .map_err(Error::WaitForBoot)
         }