diff --git a/scripts/perf/vhost/run_vhost_test.py b/scripts/perf/vhost/run_vhost_test.py index 1abb0bc4b..56933325f 100644 --- a/scripts/perf/vhost/run_vhost_test.py +++ b/scripts/perf/vhost/run_vhost_test.py @@ -152,7 +152,7 @@ parser.add_argument('-d', '--max-disks', default=0, type=int, each virtual machine gets it's own bdev to work on.") parser.add_argument('-v', '--vm-count', default=1, type=int, help="How many VMs to run in test. Default: 1") -parser.add_argument('-i', '--vm-image', default="$HOME/spdk_test_image.qcow2", +parser.add_argument('-i', '--vm-image', default="$DEPENDENCY_DIR/spdk_test_image.qcow2", type=str, help="VM image to use for running VMs.") subparsers = parser.add_subparsers() diff --git a/test/common/config/README.md b/test/common/config/README.md index fc8a6b772..789745070 100644 --- a/test/common/config/README.md +++ b/test/common/config/README.md @@ -81,5 +81,5 @@ To create the VM image manually use following steps: ~~~ ./spdk/test/common/config/vm_setup.sh -t 'fio' ~~~ -6. Place the guest VM in the host at the following location: `/home/sys_sgci/spdk_test_image.qcow2`. +6. Place the guest VM in the host at the following location: `$DEPENDENCY_DIR/spdk_test_image.qcow2`. 7. On the host, edit the `~/autorun-spdk.conf` file to include the following line: SPDK_TEST_VHOST=1. diff --git a/test/nvme/hotplug.sh b/test/nvme/hotplug.sh index 8563405a4..36fd11a53 100755 --- a/test/nvme/hotplug.sh +++ b/test/nvme/hotplug.sh @@ -54,7 +54,7 @@ function devices_delete() { } password=$1 -base_img=$HOME/spdk_test_image.qcow2 +base_img=$DEPENDENCY_DIR/spdk_test_image.qcow2 qemu_pidfile=$HOME/qemupid if [ ! -e "$base_img" ]; then diff --git a/test/vhost/common.sh b/test/vhost/common.sh index b9a7b3c29..68303726d 100644 --- a/test/vhost/common.sh +++ b/test/vhost/common.sh @@ -8,7 +8,7 @@ VM_DIR=$VHOST_DIR/vms TARGET_DIR=$VHOST_DIR/vhost VM_PASSWORD="root" -VM_IMAGE=${VM_IMAGE:-"$HOME/spdk_test_image.qcow2"} +VM_IMAGE=${VM_IMAGE:-"$DEPENDENCY_DIR/spdk_test_image.qcow2"} if ! hash $QEMU_IMG_BIN $QEMU_BIN; then error 'QEMU is not installed on this system. Unable to run vhost tests.' diff --git a/test/vhost/manual.sh b/test/vhost/manual.sh index 881ba5666..5cdb8a453 100755 --- a/test/vhost/manual.sh +++ b/test/vhost/manual.sh @@ -19,7 +19,7 @@ case $1 in echo " -h |--help prints this message" echo "" echo "Environment:" - echo " VM_IMAGE path to QCOW2 VM image used during test (default: $HOME/spdk_test_image.qcow2)" + echo " VM_IMAGE path to QCOW2 VM image used during test (default: $DEPENDENCY_DIR/spdk_test_image.qcow2)" echo "" echo "Tests are performed only on Linux machine. For other OS no action is performed." echo "" diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh index edc35fdc7..7c0ac3f7c 100755 --- a/test/vhost/perf_bench/vhost_perf.sh +++ b/test/vhost/perf_bench/vhost_perf.sh @@ -53,7 +53,7 @@ function usage() { echo " --vm-memory=INT Amount of RAM memory (in MB) to pass to a single VM." echo " Default: 2048 MB" echo " --vm-image=PATH OS image to use for running the VMs." - echo " Default: \$HOME/spdk_test_image.qcow2" + echo " Default: \$DEPENDENCY_DIR/spdk_test_image.qcow2" echo " --vm-sar-enable Measure CPU utilization in guest VMs using sar." echo " --host-sar-enable Measure CPU utilization on host using sar." echo " --sar-delay=INT Wait for X seconds before starting SAR measurement. Default: 0."