Commit 671874b7 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

test/vhost: Fix. Allow user to define vm password in vhost tests. 



Change-Id: I31f1037686144a515aafdf2bb8daa0924d49fb7f
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466319


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent aab821d4

test/vhost/common.sh

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
TEST_DIR=$(readlink -f $rootdir/..)

VM_DIR=$VHOST_DIR/vms

TARGET_DIR=$VHOST_DIR/vhost

VM_PASSWORD="root"



#TODO: Move vhost_vm_image.qcow2 into VHOST_DIR on test systems.

VM_IMAGE=$HOME/vhost_vm_image.qcow2
@@ -308,7 +309,7 @@ function vm_exec() 
	local vm_num="$1"

	shift



	sshpass -p root ssh \

	sshpass -p "$VM_PASSWORD" ssh \

		-o UserKnownHostsFile=/dev/null \

		-o StrictHostKeyChecking=no \

		-o User=root \
@@ -326,7 +327,7 @@ function vm_scp() 
	local vm_num="$1"

	shift



	sshpass -p root scp \

	sshpass -p "$VM_PASSWORD" scp \

		-o UserKnownHostsFile=/dev/null \

		-o StrictHostKeyChecking=no \

		-o User=root \

test/vhost/windows/windows_scsi_compliance.sh

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ done 


trap 'rm -f $aio_file; rm -rf $testdir/results; error_exit' SIGINT SIGTERM ERR



VM_PASSWORD="$ssh_pass"

mkdir -p $testdir/results

dd if=/dev/zero of=$aio_file bs=1M count=512