diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 468c88283..2d57102ad 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -607,18 +607,22 @@ # ODL echo "Functest: run ODL suite" - public_ip=$(env | grep OS_AUTH_URL | cut -f3 -d"/" | cut -f1 -d":") - echo "Functest: public IP is ${public_ip}" + if [ $INSTALLER_TYPE == "fuel" ]; then + odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") + neutron_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") + usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=') + pass=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=') odl_port=8181 + ODL_PORT=$odl_port ODL_IP=$odl_ip NEUTRON_IP=$neutron_ip USR_NAME=$usr_name PASS=$pass \ + $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh elif [ $INSTALLER_TYPE == "foreman" ]; then - odl_port=8081 + #odl_port=8081 + $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh else echo "INSTALLER_TYPE not valid." exit 1 fi - ODL_PORT=$odl_port ODL_IP=$public_ip NEUTRON_IP=$public_ip USR_NAME=admin PASS=admin \ - $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh # rally echo "Functest: run Functest Rally Bench suites" |