aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-10-28 16:36:54 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-10-28 16:36:54 +0000
commit26186a36912b4dba85d777953447a189a415b8a7 (patch)
treed85291f6da28178bbfc9dee0e43dae38a24e4c77
parentb39289732672b60e7e76cf22f79c4586e2ab87b1 (diff)
parent91bde2b6890bbc0d7ebad2e5ab80399654b15915 (diff)
Merge "ODL script bugfixes"
-rwxr-xr-xtestcases/Controllers/ODL/CI/start_tests.sh10
-rw-r--r--testcases/Controllers/ODL/CI/test_list.txt2
2 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 ddb15cad3..5e87726b8 100755
--- a/testcases/Controllers/ODL/CI/start_tests.sh
+++ b/testcases/Controllers/ODL/CI/start_tests.sh
@@ -3,7 +3,7 @@
BASEDIR=`dirname $0`
RESULTS_DIR='/home/opnfv/functest/results/odl/'
-REPO_DIR='/home/opnfv/repos/old_integration'
+REPO_DIR='/home/opnfv/repos/odl_integration'
#TODO: read this form config_functest.yaml
# Colors
@@ -49,16 +49,16 @@ set +x
# Change openstack password for admin tenant in neutron suite
-sed -i "s/\"password\": \".*\"/\"password\": \"${PASS}\"/" ${REPO_DIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
+sed -i "s/\"password\": \".*\"/\"password\": \"${PASS}\"/" ${REPO_DIR}/test/csit/suites/openstack/neutron/__init__.robot
# Add Start Suite and Teardown Suite
-sed -i "/^Documentation.*/a Suite Teardown Stop Suite" ${REPO_DIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
-sed -i "/^Documentation.*/a Suite Setup Start Suite" ${REPO_DIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
+sed -i "/^Documentation.*/a Suite Teardown Stop Suite" ${REPO_DIR}/test/csit/suites/openstack/neutron/__init__.robot
+sed -i "/^Documentation.*/a Suite Setup Start Suite" ${REPO_DIR}/test/csit/suites/openstack/neutron/__init__.robot
# 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}/integration/test/csit/suites/openstack/neutron/
+cp -vf ${BASEDIR}/custom_tests/neutron/* ${REPO_DIR}/test/csit/suites/openstack/neutron/
# List of tests are specified in test_list.txt
# those are relative paths to test directories from integartion suite
diff --git a/testcases/Controllers/ODL/CI/test_list.txt b/testcases/Controllers/ODL/CI/test_list.txt
index 63f4cda52..ad791e553 100644
--- a/testcases/Controllers/ODL/CI/test_list.txt
+++ b/testcases/Controllers/ODL/CI/test_list.txt
@@ -2,4 +2,4 @@
# You can specify path to specific robot test file or directory (in that case all tests from directory will be executed)
test/csit/suites/integration/basic/
-test/csit/suites/openstack/neutron/ \ No newline at end of file
+test/csit/suites/openstack/neutron/