diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index ae9459a3b..1e85ad3dd 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -55,33 +55,6 @@ build_virtiofsd() { update_workloads() { cp scripts/sha1sums-aarch64 "$WORKLOADS_DIR" - BIONIC_OS_IMAGE_DOWNLOAD_NAME="bionic-server-cloudimg-arm64.img" - BIONIC_OS_IMAGE_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$BIONIC_OS_IMAGE_DOWNLOAD_NAME" - BIONIC_OS_DOWNLOAD_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_IMAGE_DOWNLOAD_NAME" - if [ ! -f "$BIONIC_OS_DOWNLOAD_IMAGE" ]; then - pushd "$WORKLOADS_DIR" || exit - time wget --quiet $BIONIC_OS_IMAGE_DOWNLOAD_URL || exit 1 - popd || exit - fi - - BIONIC_OS_RAW_IMAGE_NAME="bionic-server-cloudimg-arm64.raw" - BIONIC_OS_RAW_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_RAW_IMAGE_NAME" - if [ ! -f "$BIONIC_OS_RAW_IMAGE" ]; then - pushd "$WORKLOADS_DIR" || exit - time qemu-img convert -p -f qcow2 -O raw $BIONIC_OS_IMAGE_DOWNLOAD_NAME $BIONIC_OS_RAW_IMAGE_NAME || exit 1 - popd || exit - fi - - # Convert the raw image to qcow2 image to remove compressed blocks from the disk. Therefore letting the - # qcow2 format image can be directly used in the integration test. - BIONIC_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME="bionic-server-cloudimg-arm64.qcow2" - BIONIC_OS_QCOW2_UNCOMPRESSED_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME" - if [ ! -f "$BIONIC_OS_QCOW2_UNCOMPRESSED_IMAGE" ]; then - pushd "$WORKLOADS_DIR" || exit - time qemu-img convert -p -f raw -O qcow2 $BIONIC_OS_RAW_IMAGE_NAME "$BIONIC_OS_QCOW2_UNCOMPRESSED_IMAGE" || exit 1 - popd || exit - fi - FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-arm64-custom-20210929-0.raw" FOCAL_OS_RAW_IMAGE_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_RAW_IMAGE_NAME" FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME" diff --git a/scripts/sha1sums-aarch64 b/scripts/sha1sums-aarch64 index a3c0af386..458550971 100644 --- a/scripts/sha1sums-aarch64 +++ b/scripts/sha1sums-aarch64 @@ -1,6 +1,3 @@ -6fee67adbfed8db7a225be23ee9d90b5bd7f19e6 bionic-server-cloudimg-arm64.img -786fe1c33588334e92b35c65e414da068df180bc bionic-server-cloudimg-arm64.raw -6e66f9f4b01adc72c884c1c1111e60afadc9c871 bionic-server-cloudimg-arm64.qcow2 e4addb6e212a298144f9eb0eb6e36019d013f0e7 alpine-minirootfs-aarch64.tar.gz 25b4f9ac308898d63b73d7db0e0e2d4768853723 focal-server-cloudimg-arm64-custom-20210929-0.qcow2 9953b31bb1923cdd8d91b1b7cc9ad3a9be1e0a59 focal-server-cloudimg-arm64-custom-20210929-0.raw diff --git a/tests/integration.rs b/tests/integration.rs index d3783023f..305525114 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -53,7 +53,6 @@ use x86_64::*; #[cfg(target_arch = "aarch64")] mod aarch64 { - pub const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-arm64.raw"; pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0.raw"; pub const FOCAL_IMAGE_UPDATE_KERNEL_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw";