summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-02-10 14:38:08 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2016-02-10 17:01:27 +0100
commitefa03f2d578fbbf377d73e7a50d446d9cfb7714c (patch)
tree120163151cb928d2f36379149f4284170033e677 /docker
parent11abc6e4d60d7c391965e20f81dbc10d7ae5fae6 (diff)
Rename the vPing scripts proplery and adapt documentation
Change-Id: Idb498eb7cefd938006661f42f1bf1772395d9d47 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/run_tests.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 9d5f681ca..7dc7f0586 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -23,12 +23,13 @@ where:
-r|--report push results to database (false by default)
-n|--no-clean do not clean OpenStack resources after test run
-t|--test run specific set of tests
- <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos,promise,ovno. Separated by comma.
+ <test_name> one or more of the following separated by comma:
+ vping_ssh,vping_userdata,odl,rally,tempest,vims,onos,promise,ovno
examples:
$(basename "$0")
- $(basename "$0") --test vping,odl
+ $(basename "$0") --test vping_ssh,odl
$(basename "$0") -t tempest,rally"
@@ -82,14 +83,14 @@ function run_test(){
echo "----------------------------------------------"
echo ""
case $test_name in
- "vping")
- info "Running vPing test..."
- python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing2.py \
+ "vping_ssh")
+ info "Running vPing-SSH test..."
+ python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_ssh.py \
--debug ${report}
;;
"vping_userdata")
- info "Running vPing test using userdata/cloudinit.... "
- python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \
+ info "Running vPing-userdata test... "
+ python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_userdata.py \
--debug ${report}
;;
"odl")
@@ -225,7 +226,7 @@ if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]] &&\
[[ -f $tests_file ]]; then
arr_test=($(cat $tests_file))
else
- arr_test=(vping tempest vims rally)
+ arr_test=(vping_ssh tempest vims rally)
fi
BASEDIR=`dirname $0`