aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bandzi <pbandzi@cisco.com>2015-05-22 08:07:39 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-05-22 08:07:39 +0000
commit160e2a2de2b1684895292526d1e43f85599c0c90 (patch)
treeddd3b739ba10d81682b5f6f3a89bec56373df1c1
parent358ebecca731123d25c805a89569c277500d6952 (diff)
parentf3ee465228638b552ed7c761093f167a47581853 (diff)
Merge "Add $BASEDIR var to all paths"
-rwxr-xr-xtestcases/Controllers/ODL/CI/start_tests.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/CI/start_tests.sh
index c2e2c325e..f4980502b 100755
--- a/testcases/Controllers/ODL/CI/start_tests.sh
+++ b/testcases/Controllers/ODL/CI/start_tests.sh
@@ -21,7 +21,7 @@ where:
value new value for var
example:
- OSTACK_IP=oscontro1 ODL_PORT=8080 bash $(basename "$0")"
+ ODL_IP=oscontro1 ODL_PORT=8080 bash $(basename "$0")"
while getopts ':h' option; do
case "$option" in
@@ -46,17 +46,17 @@ NEUTRON_IP=${NEUTRON_IP:-192.168.0.68}
set +x
echo -e "${green}Cloning ODL integration git repo.${nc}"
-if [ -d integration ]; then
- cd integration
+if [ -d ${BASEDIR}/integration ]; then
+ cd ${BASEDIR}/integration
git checkout -- .
git pull
cd -
else
- git clone https://github.com/opendaylight/integration.git
+ git clone https://github.com/opendaylight/integration.git ${BASEDIR}/integration
fi
# Change openstack password for admin tenant in neutron suite
-sed -i "s/\"password\": \"admin\"/\"password\": \"${PASS}\"/" integration/test/csit/suites/openstack/neutron/__init__.robot
+sed -i "s/\"password\": \"admin\"/\"password\": \"${PASS}\"/" ${BASEDIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
if source $BASEDIR/venv/bin/activate; then
echo -e "${green}Python virtualenv activated.${nc}"
@@ -81,7 +81,7 @@ do
[[ -z "${line}" ]] && continue
echo -e "${light_green}Starting test: $line ${nc}"
- pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} $line
+ pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} ${BASEDIR}/$line
mkdir -p $BASEDIR/logs/${test_num}
mv log.html $BASEDIR/logs/${test_num}/
mv report.html $BASEDIR/logs/${test_num}/