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

test/openstack: Fix. Assign nvmfpid var as it is used in nvmftestfini

Browse Source 
Change-Id: Id56b5034d034190f518bfa6cf84ec52a27a3ff5a
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464187
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Pawel Kaminski 2019-08-05 10:45:05 -04:00 committed by Jim Harris
parent 2cbe2acaef
commit 16ed234497
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/openstack/run_openstack_tests.sh
View File

@ -12,7 +12,7 @@ nvmftestinit
function finish_test { function finish_test {
$rpc_py destroy_lvol_store -l lvs0 $rpc_py destroy_lvol_store -l lvs0
kill -9 $rpc_proxy_pid kill -9 $rpc_proxy_pid
killprocess $spdk_tgt_pid killprocess $nvmfpid
rm $testdir/conf.json rm $testdir/conf.json
} }
@ -21,8 +21,8 @@ trap "finish_test" SIGINT SIGTERM EXIT
timing_enter run_spdk_tgt timing_enter run_spdk_tgt
$rootdir/scripts/gen_nvme.sh >> $testdir/conf.json $rootdir/scripts/gen_nvme.sh >> $testdir/conf.json
$rootdir/app/spdk_tgt/spdk_tgt -m 0x3 -p 0 -s 1024 -c $testdir/conf.json & $rootdir/app/spdk_tgt/spdk_tgt -m 0x3 -p 0 -s 1024 -c $testdir/conf.json &
spdk_tgt_pid=$! nvmfpid=$!
waitforlisten $spdk_tgt_pid waitforlisten $nvmfpid
$rpc_py set_bdev_nvme_hotplug -e $rpc_py set_bdev_nvme_hotplug -e
timing_exit run_spdk_tgt timing_exit run_spdk_tgt