From c790bba9055509f9612d1c4c4941823ec869f249 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 23 Apr 2020 10:14:43 +0100 Subject: [PATCH] tests: Migrate from Ubuntu Eoan to Focal This is the latest LTS release. Fixes: #989 Signed-off-by: Rob Bradford --- README.md | 4 ++-- scripts/run_integration_tests.sh | 18 +++++++++--------- scripts/sha1sums | 4 ++-- tests/integration.rs | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 205a89c77..8bb825025 100644 --- a/README.md +++ b/README.md @@ -229,10 +229,10 @@ $ ./cloud-hypervisor/target/release/cloud-hypervisor \ `cloud-hypervisor` is in a very early, pre-alpha stage. Use at your own risk! -As of 2019-12-12, the following cloud images are supported: +As of 2020-04-23, the following cloud images are supported: * [Clear Linux](https://download.clearlinux.org/current/) (cloudguest and kvm) * [Ubuntu Bionic](https://cloud-images.ubuntu.com/bionic/current/) (cloudimg) -* [Ubuntu Eoan](https://cloud-images.ubuntu.com/eoan/current/) (cloudimg) +* [Ubuntu Focal](https://cloud-images.ubuntu.com/focal/current/) (cloudimg) Direct kernel boot to userspace should work with most rootfs. diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index f101c9d9d..f0fdd2344 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -51,20 +51,20 @@ if [ ! -f "$BIONIC_OS_RAW_IMAGE" ]; then fi -EOAN_OS_IMAGE_NAME="eoan-server-cloudimg-amd64.img" -EOAN_OS_IMAGE_URL="https://cloudhypervisorstorage.blob.core.windows.net/images/$EOAN_OS_IMAGE_NAME" -EOAN_OS_IMAGE="$WORKLOADS_DIR/$EOAN_OS_IMAGE_NAME" -if [ ! -f "$EOAN_OS_IMAGE" ]; then +FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64.img" +FOCAL_OS_IMAGE_URL="https://cloudhypervisorstorage.blob.core.windows.net/images/$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 $EOAN_OS_IMAGE_URL || exit 1 + time wget --quiet $FOCAL_OS_IMAGE_URL || exit 1 popd fi -EOAN_OS_RAW_IMAGE_NAME="eoan-server-cloudimg-amd64-raw.img" -EOAN_OS_RAW_IMAGE="$WORKLOADS_DIR/$EOAN_OS_RAW_IMAGE_NAME" -if [ ! -f "$EOAN_OS_RAW_IMAGE" ]; then +FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64-raw.img" +FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME" +if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then pushd $WORKLOADS_DIR - time qemu-img convert -p -f qcow2 -O raw $EOAN_OS_IMAGE_NAME $EOAN_OS_RAW_IMAGE_NAME || exit 1 + time qemu-img convert -p -f qcow2 -O raw $FOCAL_OS_IMAGE_NAME $FOCAL_OS_RAW_IMAGE_NAME || exit 1 popd fi diff --git a/scripts/sha1sums b/scripts/sha1sums index ff6ed8d5f..a3defdf76 100644 --- a/scripts/sha1sums +++ b/scripts/sha1sums @@ -2,6 +2,6 @@ cf7cfa783082fc4d6b4d1c0a53e4402648c14b82 clear-31311-cloudguest.img 142a410546b592ff9536b46bb410faf8ac11edee clear-31311-cloudguest-raw.img 27f3b17962ace69b51f0ddc2012095e3109e6ed8 bionic-server-cloudimg-amd64.img 8db9cc58b01452ce2d06c313177e6e74d8582d93 bionic-server-cloudimg-amd64-raw.img -4a452cdcf781f95d31a1668ecb92a937c176709a eoan-server-cloudimg-amd64.img -91fdfb21df8920fd55915edf7669282cda2505f6 eoan-server-cloudimg-amd64-raw.img d4a44acc6014d5f83dea1c625c43d677a95fa75f alpine-minirootfs-x86_64.tar.gz +3cab64475048383e70a38550734e98961cfe0fd6 focal-server-cloudimg-amd64-raw.img +c74a95665b189f93cb16a2c1770820c6a6a43fb0 focal-server-cloudimg-amd64.img diff --git a/tests/integration.rs b/tests/integration.rs index 94b1e36be..be89ccffe 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -94,7 +94,7 @@ mod tests { } const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-amd64-raw.img"; - const EOAN_IMAGE_NAME: &str = "eoan-server-cloudimg-amd64-raw.img"; + const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-raw.img"; const CLEAR_KERNEL_CMDLINE: &str = "root=PARTUUID=6fb4d1a8-6c8c-4dd7-9f7c-1fe0b9f2574c \ console=tty0 console=ttyS0,115200n8 console=hvc0 quiet \ @@ -873,12 +873,12 @@ mod tests { test_block!(tb, "", { let mut clear = ClearDiskConfig::new(); let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string()); - let mut eoan = UbuntuDiskConfig::new(EOAN_IMAGE_NAME.to_string()); + let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); vec![ &mut clear as &mut dyn DiskConfig, &mut bionic as &mut dyn DiskConfig, - &mut eoan as &mut dyn DiskConfig, + &mut focal as &mut dyn DiskConfig, ] .iter_mut() .for_each(|disk_config| { @@ -2724,12 +2724,12 @@ mod tests { test_block!(tb, "", { let mut clear = ClearDiskConfig::new(); let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string()); - let mut eoan = UbuntuDiskConfig::new(EOAN_IMAGE_NAME.to_string()); + let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); vec![ &mut clear as &mut dyn DiskConfig, &mut bionic as &mut dyn DiskConfig, - &mut eoan as &mut dyn DiskConfig, + &mut focal as &mut dyn DiskConfig, ] .iter_mut() .for_each(|disk_config| {