From 7729225fa8756a5e29ebc3ec939efe35a1aa6e6b Mon Sep 17 00:00:00 2001 From: GangCao Date: Mon, 10 Jun 2019 17:13:44 -0400 Subject: [PATCH] nightly: fix vhost migration issue This is to solve below issue: error 'Fio job '\''/migration-tc1.job'\'' does not exist' Change-Id: I60dc6254d238878b03c5faf341b3201643286dfe Signed-off-by: GangCao Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457453 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Changpeng Liu --- test/vhost/migration/migration-tc1.sh | 2 +- test/vhost/migration/migration-tc2.sh | 2 +- test/vhost/migration/migration-tc3a.sh | 4 ++-- test/vhost/migration/migration-tc3b.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index b982bf2109..cdfb7a3118 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -54,7 +54,7 @@ function migration_tc1() # Use 2 VMs: # incoming VM - the one we want to migrate # targe VM - the one which will accept migration - local job_file="$MIGRATION_DIR/migration-tc1.job" + local job_file="$testdir/migration-tc1.job" # Run vhost vhost_run diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index 9884737c45..9c175e23e0 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -162,7 +162,7 @@ function migration_tc2() # Use 2 VMs: # incoming VM - the one we want to migrate # targe VM - the one which will accept migration - local job_file="$MIGRATION_DIR/migration-tc2.job" + local job_file="$testdir/migration-tc2.job" migration_tc2_configure_vhost diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh index 457909762e..e9be8c66c4 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -1,5 +1,5 @@ source $rootdir/test/nvmf/common.sh -source $MIGRATION_DIR/autotest.config +source $testdir/autotest.config incoming_vm=1 target_vm=2 @@ -7,7 +7,7 @@ incoming_vm_ctrlr=naa.VhostScsi0.$incoming_vm target_vm_ctrlr=naa.VhostScsi0.$target_vm share_dir=$TEST_DIR/share spdk_repo_share_dir=$TEST_DIR/share_spdk -job_file=$MIGRATION_DIR/migration-tc3.job +job_file=$testdir/migration-tc3.job if [ -z "$MGMT_TARGET_IP" ]; then error "No IP address of target is given" diff --git a/test/vhost/migration/migration-tc3b.sh b/test/vhost/migration/migration-tc3b.sh index 1acfb6b98c..68d8693017 100644 --- a/test/vhost/migration/migration-tc3b.sh +++ b/test/vhost/migration/migration-tc3b.sh @@ -2,7 +2,7 @@ # as we are usin non-interactive session to connect to remote. # Without -m it would be not possible to suspend the process. set -m -source $MIGRATION_DIR/autotest.config +source $testdir/autotest.config incoming_vm=1 target_vm=2