From 3c05626ad171d26b1a21667f18fb68fa7094474d Mon Sep 17 00:00:00 2001 From: Ruoqing He Date: Mon, 11 Nov 2024 10:14:55 +0800 Subject: [PATCH] scripts: Replace download_linux with prepare_linux `prepare_linux` is capable of determining whether we need to invoke `build_custom_linux` for building linux from source or `download_linux` for downloading pre-built. Signed-off-by: Ruoqing He --- scripts/run_integration_tests_aarch64.sh | 4 ++-- scripts/run_integration_tests_live_migration.sh | 4 ++-- scripts/run_integration_tests_rate_limiter.sh | 4 ++-- scripts/run_integration_tests_x86_64.sh | 4 ++-- scripts/run_metrics.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 0632fd925..648808a61 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -154,8 +154,8 @@ update_workloads() { fi popd || exit - # Download prebuild linux binaries - download_linux + # Prepare linux image (build from source or download pre-built) + prepare_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-20210929-0-update-kernel.raw" diff --git a/scripts/run_integration_tests_live_migration.sh b/scripts/run_integration_tests_live_migration.sh index ad0a4f404..89fe958a8 100755 --- a/scripts/run_integration_tests_live_migration.sh +++ b/scripts/run_integration_tests_live_migration.sh @@ -56,8 +56,8 @@ popd || exit # Build custom kernel based on virtio-pmem and virtio-fs upstream patches VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux" if [ ! -f "$VMLINUX_IMAGE" ]; then - # Download prebuild linux binaries - download_linux + # Prepare linux image (build from source or download pre-built) + prepare_linux fi CFLAGS="" diff --git a/scripts/run_integration_tests_rate_limiter.sh b/scripts/run_integration_tests_rate_limiter.sh index be008625f..56fb91e6e 100755 --- a/scripts/run_integration_tests_rate_limiter.sh +++ b/scripts/run_integration_tests_rate_limiter.sh @@ -44,8 +44,8 @@ if ! grep focal sha1sums-x86_64 | sha1sum --check; then fi popd || exit -# Download prebuild linux binaries -download_linux +# Prepare linux image (build from source or download pre-built) +prepare_linux 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 22a1c758e..6da524c5c 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -102,8 +102,8 @@ popd || exit # Build custom kernel based on virtio-pmem and virtio-fs upstream patches VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux" if [ ! -f "$VMLINUX_IMAGE" ]; then - # Download prebuild linux binaries - download_linux + # Prepare linux image (build from source or download pre-built) + prepare_linux fi VIRTIOFSD="$WORKLOADS_DIR/virtiofsd" diff --git a/scripts/run_metrics.sh b/scripts/run_metrics.sh index f244eb62d..3f82abda3 100755 --- a/scripts/run_metrics.sh +++ b/scripts/run_metrics.sh @@ -80,8 +80,8 @@ if [ "${TEST_ARCH}" == "aarch64" ]; then guestunmount "$FOCAL_OS_RAW_IMAGE_UPDATE_TOOL_ROOT_DIR" fi -# Download prebuild linux binaries -download_linux +# Prepare linux image (build from source or download pre-built) +prepare_linux CFLAGS="" if [[ "${BUILD_TARGET}" == "${TEST_ARCH}-unknown-linux-musl" ]]; then