diff options
Diffstat (limited to 'functest')
| -rw-r--r-- | functest/ci/config_functest.yaml | 3 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 12 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/ping.sh | 19 | ||||
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 3 |
4 files changed, 17 insertions, 20 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index e26b3139..8da1d617 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -12,7 +12,8 @@ general: repo_doctor: /home/opnfv/repos/doctor repo_copper: /home/opnfv/repos/copper repo_domino: /home/opnfv/repos/domino - repo_fds: /home/opnfv/repos/fds + repo_odl_test: /src/odl_test + repo_fds: /src/fds repo_securityscan: /home/opnfv/repos/securityscanning repo_vrouter: /home/opnfv/repos/vnfs/vrouter functest: /home/opnfv/functest diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 0f8dff01..3dcf9b13 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -162,8 +162,8 @@ tiers: class: 'ODLTests' args: suites: - - /home/opnfv/repos/odl_test/csit/suites/integration/basic - - /home/opnfv/repos/odl_test/csit/suites/openstack/neutron + - /src/odl_test/csit/suites/integration/basic + - /src/odl_test/csit/suites/openstack/neutron - case_name: odl_netvirt @@ -183,9 +183,9 @@ tiers: class: 'ODLTests' args: suites: - - /home/opnfv/repos/odl_test/csit/suites/integration/basic - - /home/opnfv/repos/odl_test/csit/suites/openstack/neutron - - /home/opnfv/repos/odl_test/csit/suites/openstack/connectivity + - /src/odl_test/csit/suites/integration/basic + - /src/odl_test/csit/suites/openstack/neutron + - /src/odl_test/csit/suites/openstack/connectivity - case_name: fds @@ -204,7 +204,7 @@ tiers: class: 'ODLTests' args: suites: - - /home/opnfv/repos/fds/testing/robot + - /src/fds/testing/robot - case_name: onos diff --git a/functest/opnfv_tests/openstack/vping/ping.sh b/functest/opnfv_tests/openstack/vping/ping.sh index 693b8682..15f5e84e 100644 --- a/functest/opnfv_tests/openstack/vping/ping.sh +++ b/functest/opnfv_tests/openstack/vping/ping.sh @@ -1,13 +1,10 @@ #!/bin/sh -while true; do - ping -c 1 $1 2>&1 >/dev/null - RES=$? - if [ "Z$RES" = "Z0" ] ; then - echo 'vPing OK' - break - else - echo 'vPing KO' - fi - sleep 1 -done
\ No newline at end of file + +ping -c 1 $1 2>&1 >/dev/null +RES=$? +if [ "Z$RES" = "Z0" ] ; then + echo 'vPing OK' +else + echo 'vPing KO' +fi diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 5724012c..841da834 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -66,8 +66,7 @@ class ODLResultVisitor(robot.api.ResultVisitor): class ODLTests(testcase.TestCase): """ODL test runner.""" - odl_test_repo = os.path.join( - constants.CONST.__getattribute__('dir_repos'), 'odl_test') + odl_test_repo = constants.CONST.__getattribute__('dir_repo_odl_test') neutron_suite_dir = os.path.join(odl_test_repo, "csit/suites/openstack/neutron") basic_suite_dir = os.path.join(odl_test_repo, |