summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-12-18 17:23:47 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-18 17:23:47 +0000
commit31472d96528432e59c404f0093732905c8645577 (patch)
tree0e76e16651cc68402f160b81ac9e7a327e074956
parentef95155c103ebe8406010758d641c2f857987190 (diff)
parent3e2cea11dc1a9977595003b94955679bbe375365 (diff)
Merge "Fix the call to the ODL test."
-rwxr-xr-xdocker/prepare_env.sh1
-rwxr-xr-xdocker/run_tests.sh28
2 files changed, 13 insertions, 16 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 5a39c8407..0c618bff8 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -92,6 +92,7 @@ if [ $offline == false ]; then
info "Functest repo: given commit is ${FUNCTEST_COMMIT}. Reseting..."
git reset --hard ${FUNCTEST_COMMIT}
fi
+ source ${BASEDIR}/common.sh
info "Updating Releng repository...."
cd ${RELENG_REPO_DIR}
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 64b1fc851..c75110b3d 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -50,30 +50,26 @@ function run_test(){
;;
"odl")
info "Running ODL test..."
+ neutron_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+ odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+ usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=')
+ password=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=')
+ odl_port=8181
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 \
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
- elif [ $INSTALLER_TYPE == "foreman" ]; then
- #odl_port=8081
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+ odl_port=8282
elif [ $INSTALLER_TYPE == "apex" ]; then
- # TODO
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+ pass
elif [ $INSTALLER_TYPE == "joid" ]; then
- # TODO
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+ pass
elif [ $INSTALLER_TYPE == "compass" ]; then
- # TODO
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+ pass
else
error "INSTALLER_TYPE not valid."
exit 1
fi
+ ODL_PORT=$odl_port ODL_IP=$odl_ip NEUTRON_IP=$neutron_ip USR_NAME=$usr_name PASS=$password \
+ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+
# save ODL results
odl_logs="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/logs"
if [ -d ${odl_logs} ]; then