summaryrefslogtreecommitdiffstats
path: root/docker/run_tests.sh
diff options
context:
space:
mode:
Diffstat (limited to 'docker/run_tests.sh')
-rwxr-xr-xdocker/run_tests.sh18
1 files changed, 5 insertions, 13 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 00d534871..898cc4ca0 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -34,7 +34,7 @@ arr_test=(vping odl tempest vims rally)
function clean_openstack(){
python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py \
- --debug ${FUNCTEST_REPO_DIR}/
+ --debug
}
function run_test(){
@@ -46,7 +46,7 @@ function run_test(){
"vping")
info "Running vPing test..."
python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \
- --debug ${FUNCTEST_REPO_DIR}/ ${report}
+ --debug ${report}
;;
"odl")
info "Running ODL test..."
@@ -79,7 +79,7 @@ function run_test(){
"tempest")
info "Running Tempest smoke tests..."
python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \
- --debug ${FUNCTEST_REPO_DIR}/ -m smoke ${report}
+ --debug -m smoke ${report}
# save tempest.conf for further troubleshooting
tempest_conf="${RALLY_VENV_DIR}/tempest/for-deployment-*/tempest.conf"
if [ -f ${tempest_conf} ]; then
@@ -90,13 +90,13 @@ function run_test(){
"vims")
info "Running vIMS test..."
python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \
- --debug ${FUNCTEST_REPO_DIR}/ ${report}
+ --debug ${report}
clean_openstack
;;
"rally")
info "Running Rally benchmark suite..."
python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally.py \
- --debug ${FUNCTEST_REPO_DIR}/ all ${report}
+ --debug all ${report}
clean_openstack
;;
"bgpvpn_template")
@@ -175,14 +175,6 @@ fi
info "Sourcing Credentials ${FUNCTEST_CONF_DIR}/openstack.creds to run the tests.."
source ${FUNCTEST_CONF_DIR}/openstack.creds
-# Check OpenStack
-info "Checking that the basic OpenStack services are functional..."
-${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/check_os.sh
-RETVAL=$?
-if [ $RETVAL -ne 0 ]; then
- exit 1
-fi
-
# Run tests
if [ "${TEST}" != "" ]; then
for i in "${arr_test_exec[@]}"; do