ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: move spdk_test_image.qcow2 to spdk_dependencies dir

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I8d75f5fa22e79c93d1f8929b6df048b440d9fb8a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6940
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Maciej Wawryk 2021-03-18 15:13:10 +01:00 committed by Jim Harris
parent 1794286d30
commit 1fc0c2d8b9
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/perf/vhost/run_vhost_test.py
View File

@ -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.") each virtual machine gets it's own bdev to work on.")
parser.add_argument('-v', '--vm-count', default=1, type=int, parser.add_argument('-v', '--vm-count', default=1, type=int,
help="How many VMs to run in test. Default: 1") 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.") type=str, help="VM image to use for running VMs.")
subparsers = parser.add_subparsers() subparsers = parser.add_subparsers()

2
test/common/config/README.md
View File

@ -81,5 +81,5 @@ To create the VM image manually use following steps:
~~~ ~~~
./spdk/test/common/config/vm_setup.sh -t 'fio' ./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. 7. On the host, edit the `~/autorun-spdk.conf` file to include the following line: SPDK_TEST_VHOST=1.

2
test/nvme/hotplug.sh
View File

@ -54,7 +54,7 @@ function devices_delete() {
} }
password=$1 password=$1
base_img=$HOME/spdk_test_image.qcow2 base_img=$DEPENDENCY_DIR/spdk_test_image.qcow2
qemu_pidfile=$HOME/qemupid qemu_pidfile=$HOME/qemupid
if [ ! -e "$base_img" ]; then if [ ! -e "$base_img" ]; then

2
test/vhost/common.sh
View File

@ -8,7 +8,7 @@ VM_DIR=$VHOST_DIR/vms
TARGET_DIR=$VHOST_DIR/vhost TARGET_DIR=$VHOST_DIR/vhost
VM_PASSWORD="root" 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 if ! hash $QEMU_IMG_BIN $QEMU_BIN; then
error 'QEMU is not installed on this system. Unable to run vhost tests.' error 'QEMU is not installed on this system. Unable to run vhost tests.'

2
test/vhost/manual.sh
View File

@ -19,7 +19,7 @@ case $1 in
echo " -h |--help prints this message" echo " -h |--help prints this message"
echo "" echo ""
echo "Environment:" 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 ""
echo "Tests are performed only on Linux machine. For other OS no action is performed." echo "Tests are performed only on Linux machine. For other OS no action is performed."
echo "" echo ""

2
test/vhost/perf_bench/vhost_perf.sh
View File

@ -53,7 +53,7 @@ function usage() {
echo " --vm-memory=INT Amount of RAM memory (in MB) to pass to a single VM." echo " --vm-memory=INT Amount of RAM memory (in MB) to pass to a single VM."
echo " Default: 2048 MB" echo " Default: 2048 MB"
echo " --vm-image=PATH OS image to use for running the VMs." 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 " --vm-sar-enable Measure CPU utilization in guest VMs using sar."
echo " --host-sar-enable Measure CPU utilization on host 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." echo " --sar-delay=INT Wait for X seconds before starting SAR measurement. Default: 0."