Commit 1fc0c2d8 authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

test: move spdk_test_image.qcow2 to spdk_dependencies dir 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I8d75f5fa22e79c93d1f8929b6df048b440d9fb8a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6940


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 1794286d

scripts/perf/vhost/run_vhost_test.py

+1 −1
Original line number Diff line number Diff line
@@ -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()

test/common/config/README.md

+1 −1
Original line number Diff line number Diff line
@@ -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.

test/nvme/hotplug.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

test/vhost/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -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.'

test/vhost/manual.sh

+1 −1
Original line number Diff line number Diff line
@@ -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 ""