From 325e62372d15188d016f309a3b1a0240523a2cc4 Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Wed, 8 Mar 2023 16:05:31 -0800 Subject: [PATCH] scripts: Ensure to rebuild custom kernel for bare-metal tests Tests of rate-limiter and vfio are running on bare-metal, so we need to ensure the custom kernel is updated and rebuilt for them. Signed-off-by: Bo Chen --- scripts/run_integration_tests_rate_limiter.sh | 6 +----- scripts/run_integration_tests_vfio.sh | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/run_integration_tests_rate_limiter.sh b/scripts/run_integration_tests_rate_limiter.sh index 42a987146..d4fbe2ff8 100755 --- a/scripts/run_integration_tests_rate_limiter.sh +++ b/scripts/run_integration_tests_rate_limiter.sh @@ -45,11 +45,7 @@ if [ $? -ne 0 ]; then fi popd -# Build custom kernel based on virtio-pmem and virtio-fs upstream patches -VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux" -if [ ! -f "$VMLINUX_IMAGE" ]; then - build_custom_linux -fi +build_custom_linux BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}" CFLAGS="" diff --git a/scripts/run_integration_tests_vfio.sh b/scripts/run_integration_tests_vfio.sh index 66711dd65..44411aa04 100755 --- a/scripts/run_integration_tests_vfio.sh +++ b/scripts/run_integration_tests_vfio.sh @@ -12,9 +12,7 @@ FOCAL_OS_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_IMAGE_NAME" FW="$WORKLOADS_DIR/hypervisor-fw" VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux" -if [ ! -f "$VMLINUX_IMAGE" ]; then - build_custom_linux -fi +build_custom_linux BLK_IMAGE="$WORKLOADS_DIR/blk.img" MNT_DIR="mount_image"