summaryrefslogtreecommitdiffstats
path: root/testcases/Controllers
diff options
context:
space:
mode:
authorDaniel Farrell <dfarrell@redhat.com>2016-06-07 11:48:35 -0400
committerDaniel Farrell <dfarrell@redhat.com>2016-06-07 13:38:50 -0400
commitd2828dcd84b1c1b8f1699da98ec7f17cf58228da (patch)
treea16f9d8e1563c099c7b5ebafbc6eeba3f59d5453 /testcases/Controllers
parent5c7bb2ed518f664e2168dcbf70577288fffc9cf3 (diff)
Use current ODL Integration/Test repo
ODL Integration used to contain system testing, Karaf distribution building and packaging/delivery logic. It was split into three projects in August 2015: Int/Test, Int/Distribution and Int/Packaging. https://wiki.opendaylight.org/view/Archive_Proposals/Integration The integration.git repo Functest was cloning is the old one, containing all three projects. It hasn't been updated since the split. The new integration-test.git repo is the current version of ODL's system test code. This change also clones ODL from its official Gerrit, instead of its GitHub mirror. Change-Id: I6b38b1fedada504411ca0e0639355339f373084c Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Diffstat (limited to 'testcases/Controllers')
-rwxr-xr-xtestcases/Controllers/ODL/start_tests.sh6
-rw-r--r--testcases/Controllers/ODL/test_list.txt4
2 files changed, 5 insertions, 5 deletions
diff --git a/testcases/Controllers/ODL/start_tests.sh b/testcases/Controllers/ODL/start_tests.sh
index 3800b6307..7f5f121b6 100755
--- a/testcases/Controllers/ODL/start_tests.sh
+++ b/testcases/Controllers/ODL/start_tests.sh
@@ -9,7 +9,7 @@
BASEDIR=`dirname $0`
RESULTS_DIR='/home/opnfv/functest/results/odl/'
-REPO_DIR='/home/opnfv/repos/odl_integration'
+REPO_DIR='/home/opnfv/repos/odl_test'
#TODO: read this form config_functest.yaml
# Colors
@@ -54,7 +54,7 @@ NEUTRON_IP=${NEUTRON_IP:-192.168.0.68}
KEYSTONE_IP=${KEYSTONE_IP:-192.168.0.69}
set +x
-init_file=${REPO_DIR}/test/csit/suites/openstack/neutron/__init__.robot
+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
@@ -66,7 +66,7 @@ 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}/test/csit/suites/openstack/neutron/
+cp -vf ${BASEDIR}/custom_tests/neutron/* ${REPO_DIR}/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/test_list.txt b/testcases/Controllers/ODL/test_list.txt
index ad791e553..ec8cd32e2 100644
--- a/testcases/Controllers/ODL/test_list.txt
+++ b/testcases/Controllers/ODL/test_list.txt
@@ -1,5 +1,5 @@
# List of tests` which will be executed by script start_test.sh
# 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/
+csit/suites/integration/basic/
+csit/suites/openstack/neutron/