mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-03 20:15:45 +00:00
tests: Migrate from Ubuntu Eoan to Focal
This is the latest LTS release. Fixes: #989 Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
e525af7a61
commit
c790bba905
@ -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!
|
`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)
|
* [Clear Linux](https://download.clearlinux.org/current/) (cloudguest and kvm)
|
||||||
* [Ubuntu Bionic](https://cloud-images.ubuntu.com/bionic/current/) (cloudimg)
|
* [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.
|
Direct kernel boot to userspace should work with most rootfs.
|
||||||
|
|
||||||
|
@ -51,20 +51,20 @@ if [ ! -f "$BIONIC_OS_RAW_IMAGE" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
EOAN_OS_IMAGE_NAME="eoan-server-cloudimg-amd64.img"
|
FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64.img"
|
||||||
EOAN_OS_IMAGE_URL="https://cloudhypervisorstorage.blob.core.windows.net/images/$EOAN_OS_IMAGE_NAME"
|
FOCAL_OS_IMAGE_URL="https://cloudhypervisorstorage.blob.core.windows.net/images/$FOCAL_OS_IMAGE_NAME"
|
||||||
EOAN_OS_IMAGE="$WORKLOADS_DIR/$EOAN_OS_IMAGE_NAME"
|
FOCAL_OS_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_IMAGE_NAME"
|
||||||
if [ ! -f "$EOAN_OS_IMAGE" ]; then
|
if [ ! -f "$FOCAL_OS_IMAGE" ]; then
|
||||||
pushd $WORKLOADS_DIR
|
pushd $WORKLOADS_DIR
|
||||||
time wget --quiet $EOAN_OS_IMAGE_URL || exit 1
|
time wget --quiet $FOCAL_OS_IMAGE_URL || exit 1
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
EOAN_OS_RAW_IMAGE_NAME="eoan-server-cloudimg-amd64-raw.img"
|
FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64-raw.img"
|
||||||
EOAN_OS_RAW_IMAGE="$WORKLOADS_DIR/$EOAN_OS_RAW_IMAGE_NAME"
|
FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME"
|
||||||
if [ ! -f "$EOAN_OS_RAW_IMAGE" ]; then
|
if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
|
||||||
pushd $WORKLOADS_DIR
|
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
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -2,6 +2,6 @@ cf7cfa783082fc4d6b4d1c0a53e4402648c14b82 clear-31311-cloudguest.img
|
|||||||
142a410546b592ff9536b46bb410faf8ac11edee clear-31311-cloudguest-raw.img
|
142a410546b592ff9536b46bb410faf8ac11edee clear-31311-cloudguest-raw.img
|
||||||
27f3b17962ace69b51f0ddc2012095e3109e6ed8 bionic-server-cloudimg-amd64.img
|
27f3b17962ace69b51f0ddc2012095e3109e6ed8 bionic-server-cloudimg-amd64.img
|
||||||
8db9cc58b01452ce2d06c313177e6e74d8582d93 bionic-server-cloudimg-amd64-raw.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
|
d4a44acc6014d5f83dea1c625c43d677a95fa75f alpine-minirootfs-x86_64.tar.gz
|
||||||
|
3cab64475048383e70a38550734e98961cfe0fd6 focal-server-cloudimg-amd64-raw.img
|
||||||
|
c74a95665b189f93cb16a2c1770820c6a6a43fb0 focal-server-cloudimg-amd64.img
|
||||||
|
@ -94,7 +94,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-amd64-raw.img";
|
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 \
|
const CLEAR_KERNEL_CMDLINE: &str = "root=PARTUUID=6fb4d1a8-6c8c-4dd7-9f7c-1fe0b9f2574c \
|
||||||
console=tty0 console=ttyS0,115200n8 console=hvc0 quiet \
|
console=tty0 console=ttyS0,115200n8 console=hvc0 quiet \
|
||||||
@ -873,12 +873,12 @@ mod tests {
|
|||||||
test_block!(tb, "", {
|
test_block!(tb, "", {
|
||||||
let mut clear = ClearDiskConfig::new();
|
let mut clear = ClearDiskConfig::new();
|
||||||
let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string());
|
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![
|
vec![
|
||||||
&mut clear as &mut dyn DiskConfig,
|
&mut clear as &mut dyn DiskConfig,
|
||||||
&mut bionic as &mut dyn DiskConfig,
|
&mut bionic as &mut dyn DiskConfig,
|
||||||
&mut eoan as &mut dyn DiskConfig,
|
&mut focal as &mut dyn DiskConfig,
|
||||||
]
|
]
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
.for_each(|disk_config| {
|
.for_each(|disk_config| {
|
||||||
@ -2724,12 +2724,12 @@ mod tests {
|
|||||||
test_block!(tb, "", {
|
test_block!(tb, "", {
|
||||||
let mut clear = ClearDiskConfig::new();
|
let mut clear = ClearDiskConfig::new();
|
||||||
let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string());
|
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![
|
vec![
|
||||||
&mut clear as &mut dyn DiskConfig,
|
&mut clear as &mut dyn DiskConfig,
|
||||||
&mut bionic as &mut dyn DiskConfig,
|
&mut bionic as &mut dyn DiskConfig,
|
||||||
&mut eoan as &mut dyn DiskConfig,
|
&mut focal as &mut dyn DiskConfig,
|
||||||
]
|
]
|
||||||
.iter_mut()
|
.iter_mut()
|
||||||
.for_each(|disk_config| {
|
.for_each(|disk_config| {
|
||||||
|
Loading…
Reference in New Issue
Block a user