diff options
Diffstat (limited to 'docker/run_tests.sh')
| -rwxr-xr-x | docker/run_tests.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 7c5349ae..ff390453 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -63,7 +63,7 @@ function odl_tests(){ elif [ $INSTALLER_TYPE == "apex" ]; then : elif [ $INSTALLER_TYPE == "joid" ]; then - odl_ip=$(env | grep ODL_CONTROLLER | cut -f2 -d'=') + odl_ip=$(env | grep SDN_CONTROLLER | cut -f2 -d'=') neutron_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") odl_port=8080 : @@ -125,10 +125,8 @@ function run_test(){ ;; "rally") info "Running Rally benchmark suite..." - cinder type-create volume-test #provisional python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \ --debug all ${report} - cinder type-delete $(cinder type-list|grep test|awk '{print $2}') clean_openstack ;; @@ -166,7 +164,11 @@ test/csit/suites/vpnservice ;; "onos") info "Running ONOS test case..." - python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py + if [ $INSTALLER_TYPE == "joid" ]; then + python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py -i joid + else + python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py + fi ;; "promise") info "Running PROMISE test case..." |