From 52ce0421255e4d2aaa35fe33b301baaf5dce2e2d Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 10 Jun 2019 14:59:04 +0100 Subject: [PATCH] tests: Bump the Clear Linux version Switch the Clear Linux version to a newer release and cache that in an azure bucket in the same region to improve the CI speed. Signed-off-by: Rob Bradford --- scripts/run_integration_tests.sh | 6 +++--- src/main.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 55d56300a..56fade8d5 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -14,14 +14,14 @@ if [ ! -f "$FW" ]; then popd fi -OS_IMAGE_NAME="clear-29620-cloud.img" -OS_IMAGE_URL="https://download.clearlinux.org/releases/29620/clear/clear-29620-cloud.img.xz" +OS_IMAGE_NAME="clear-29810-cloud.img" +OS_IMAGE_URL="https://cloudhypervisorstorage.blob.core.windows.net/images/$OS_IMAGE_NAME.xz" OS_IMAGE="$WORKLOADS_DIR/$OS_IMAGE_NAME" if [ ! -f "$OS_IMAGE" ]; then pushd $WORKLOADS_DIR wget --quiet $OS_IMAGE_URL unxz $OS_IMAGE_NAME.xz -popd + popd fi rm /tmp/cloudinit.img diff --git a/src/main.rs b/src/main.rs index 2684ec315..91ae9f37f 100755 --- a/src/main.rs +++ b/src/main.rs @@ -183,7 +183,7 @@ mod tests { fw_path.push("hypervisor-fw"); let mut osdisk_base_path = workload_path.clone(); - osdisk_base_path.push("clear-29620-cloud.img"); + osdisk_base_path.push("clear-29810-cloud.img"); let osdisk_path = "/tmp/osdisk.img"; let cloudinit_path = "/tmp/cloudinit.img";