diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2016-07-08 09:50:11 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2016-07-08 09:53:30 +0200 |
| commit | 0af5adcf2bbababf8143c3a146b9d515c3433da0 (patch) | |
| tree | 2740f157d02c5707c689b5bb4040056a67456267 | |
| parent | 19c88ef768e167465bc1c834e25e0f4cbac873b6 (diff) | |
Conform start_tests.sh to last ODL patches
It mainly removes all hacks vs __init__.robot which can be deleted
since the patches [1] and [2] has been merged.
[1] https://git.opendaylight.org/gerrit/#/c/41461/
[2] https://git.opendaylight.org/gerrit/#/c/41463/
Change-Id: I0692681794737c06609e06f88af64edc6fe98efe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r--[-rwxr-xr-x] | testcases/Controllers/ODL/start_tests.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/testcases/Controllers/ODL/start_tests.sh b/testcases/Controllers/ODL/start_tests.sh index 8e655cfcf..2e1805312 100755..100644 --- a/testcases/Controllers/ODL/start_tests.sh +++ b/testcases/Controllers/ODL/start_tests.sh @@ -54,16 +54,6 @@ NEUTRON_IP=${NEUTRON_IP:-192.168.0.68} KEYSTONE_IP=${KEYSTONE_IP:-192.168.0.69} set +x -init_file=${REPO_DIR}/csit/suites/openstack/neutron/__init__.robot -# Change openstack password for admin tenant in neutron suite -sed -i "s/\"password\": \".*\"/\"password\": \"${PASS}\"/" $init_file - -# Add Start Suite and Teardown Suite -if [[ ! `grep 'Suite Teardown' ${init_file}` ]]; then - sed -i "/^Documentation.*/a Suite Teardown Stop Suite" $init_file - sed -i "/^Documentation.*/a Suite Setup Start Suite" $init_file -fi - # add custom tests to suite, if there are more custom tests needed this will be reworked echo -e "${green}Copy custom tests to suite.${nc}" cp -vf ${BASEDIR}/custom_tests/neutron/* ${REPO_DIR}/csit/suites/openstack/neutron/ @@ -81,7 +71,7 @@ do ((test_num++)) echo -e "${light_green}Starting test: $line ${nc}" - pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v ODL_SYSTEM_IP:${ODL_IP} ${REPO_DIR}/$line + pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v ODL_SYSTEM_IP:${ODL_IP} -v OSPASSWORD:\"${PASS}\" ${REPO_DIR}/$line mkdir -p $RESULTS_DIR/logs/${test_num} mv log.html $RESULTS_DIR/logs/${test_num}/ mv report.html $RESULTS_DIR/logs/${test_num}/ |