From 1511cbda872b62b756aaeb4a92a928ae08a485a6 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Tue, 28 Sep 2021 12:07:00 +0100 Subject: [PATCH] tests, scripts: Update custom aarch64 image to include "stress" Signed-off-by: Rob Bradford --- scripts/run_integration_tests_aarch64.sh | 6 +++--- scripts/sha1sums-aarch64 | 4 ++-- tests/integration.rs | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index b967ece5b..103818823 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -132,7 +132,7 @@ update_workloads() { popd fi - FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-arm64-custom.raw" + 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" if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then @@ -141,7 +141,7 @@ update_workloads() { popd fi - FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME="focal-server-cloudimg-arm64-custom.qcow2" + FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME="focal-server-cloudimg-arm64-custom-20210929-0.qcow2" FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME" FOCAL_OS_QCOW2_UNCOMPRESSED_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME" if [ ! -f "$FOCAL_OS_QCOW2_UNCOMPRESSED_IMAGE" ]; then @@ -188,7 +188,7 @@ update_workloads() { build_custom_linux # Update the kernel in the cloud image for some tests that requires recent kernel version - FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_NAME="focal-server-cloudimg-arm64-custom-update-kernel.raw" + FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_NAME="focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw" cp "$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME" "$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_NAME" FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR="$WORKLOADS_DIR/focal-server-cloudimg-root" mkdir -p "$FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_ROOT_DIR" diff --git a/scripts/sha1sums-aarch64 b/scripts/sha1sums-aarch64 index 60149edc3..6e0aabed7 100644 --- a/scripts/sha1sums-aarch64 +++ b/scripts/sha1sums-aarch64 @@ -2,5 +2,5 @@ 786fe1c33588334e92b35c65e414da068df180bc bionic-server-cloudimg-arm64.raw 6e66f9f4b01adc72c884c1c1111e60afadc9c871 bionic-server-cloudimg-arm64.qcow2 e4addb6e212a298144f9eb0eb6e36019d013f0e7 alpine-minirootfs-aarch64.tar.gz -063d1a9f32db641138e6e0c53f58e6545a3d48e6 focal-server-cloudimg-arm64-custom.raw -013837926872f1c7d1b3a1a95305e4a31c8600ab focal-server-cloudimg-arm64-custom.qcow2 +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 6bee0b303..b3a4c199e 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -62,20 +62,20 @@ mod tests { #[cfg(target_arch = "aarch64")] const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-arm64.raw"; #[cfg(target_arch = "aarch64")] - const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom.raw"; + const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0.raw"; #[cfg(target_arch = "aarch64")] const FOCAL_IMAGE_UPDATE_KERNEL_NAME: &str = - "focal-server-cloudimg-arm64-custom-update-kernel.raw"; + "focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw"; #[cfg(target_arch = "aarch64")] - const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-arm64-custom.qcow2"; + const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-arm64-custom-20210929-0.qcow2"; #[cfg(target_arch = "x86_64")] const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-amd64-custom-20210609-0.qcow2"; #[cfg(target_arch = "aarch64")] - const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-arm64-custom.vhd"; + const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-arm64-custom-20210929-0.vhd"; #[cfg(target_arch = "x86_64")] const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhd"; #[cfg(target_arch = "aarch64")] - const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-arm64-custom.vhdx"; + const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-arm64-custom-20210929-0.vhdx"; #[cfg(target_arch = "x86_64")] const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhdx"; #[cfg(target_arch = "x86_64")]