diff --git a/scripts/run_integration_tests_sgx.sh b/scripts/run_integration_tests_sgx.sh index 5cab0e365..d7bded779 100755 --- a/scripts/run_integration_tests_sgx.sh +++ b/scripts/run_integration_tests_sgx.sh @@ -14,12 +14,7 @@ fi WORKLOADS_DIR="$HOME/workloads" mkdir -p "$WORKLOADS_DIR" -FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]') -FW="$WORKLOADS_DIR/hypervisor-fw" -pushd $WORKLOADS_DIR -rm -f $FW -time wget --quiet $FW_URL || exit 1 -popd +download_hypervisor_fw JAMMY_OS_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20230119-0.qcow2" JAMMY_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$JAMMY_OS_IMAGE_NAME" diff --git a/scripts/run_integration_tests_vfio.sh b/scripts/run_integration_tests_vfio.sh index dc6dcfa85..894cdb3f7 100755 --- a/scripts/run_integration_tests_vfio.sh +++ b/scripts/run_integration_tests_vfio.sh @@ -14,11 +14,7 @@ process_common_args "$@" WORKLOADS_DIR="$HOME/workloads" -# Always download the latest "hypervisor-fw" -FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]') -pushd $WORKLOADS_DIR -time wget --quiet $FW_URL -O hypervisor-fw || exit 1 -popd +download_hypervisor_fw CFLAGS="" if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 239dc86f5..f389d7227 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -18,13 +18,7 @@ fi cp scripts/sha1sums-x86_64 $WORKLOADS_DIR -FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]') -FW="$WORKLOADS_DIR/hypervisor-fw" -if [ ! -f "$FW" ]; then - pushd $WORKLOADS_DIR - time wget --quiet $FW_URL || exit 1 - popd -fi +download_hypervisor_fw OVMF_FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/edk2/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]') OVMF_FW="$WORKLOADS_DIR/CLOUDHV.fd" diff --git a/scripts/test-util.sh b/scripts/test-util.sh index 0a0a259e0..acb58b9ce 100644 --- a/scripts/test-util.sh +++ b/scripts/test-util.sh @@ -107,3 +107,12 @@ process_common_args() { test_binary_args=($@) } + +download_hypervisor_fw() { + FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]') + FW="$WORKLOADS_DIR/hypervisor-fw" + pushd $WORKLOADS_DIR + rm -f $FW + time wget --quiet $FW_URL || exit 1 + popd +}