diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_functest.yaml | 14 | ||||
| -rwxr-xr-x | ci/exec_test.sh | 41 | ||||
| -rw-r--r-- | ci/testcases.yaml | 2 |
3 files changed, 29 insertions, 28 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index d6497678a..cca4959a9 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -1,13 +1,13 @@ general: directories: # Relative to the path where the repo is cloned: - dir_vping: testcases/OpenStack/vPing/ - dir_odl: testcases/Controllers/ODL/ - dir_rally: testcases/OpenStack/rally/ - dir_tempest_cases: testcases/OpenStack/tempest/custom_tests/ - dir_vIMS: testcases/vnf/vIMS/ - dir_onos: testcases/Controllers/ONOS/Teston/ - dir_onos_sfc: testcases/Controllers/ONOS/Sfc/ + dir_vping: functest/opnfv_tests/OpenStack/vPing/ + dir_odl: functest/opnfv_tests/Controllers/ODL/ + dir_rally: functest/opnfv_tests/OpenStack/rally/ + dir_tempest_cases: functest/opnfv_tests/OpenStack/tempest/custom_tests/ + dir_vIMS: functest/opnfv_tests/vnf/vIMS/ + dir_onos: functest/opnfv_tests/Controllers/ONOS/Teston/ + dir_onos_sfc: functest/opnfv_tests/Controllers/ONOS/Sfc/ # Absolute path dir_repos: /home/opnfv/repos diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 6fdc42666..640180059 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -37,6 +37,7 @@ if [[ "${CI_DEBUG,,}" == "true" ]];then fi FUNCTEST_REPO_DIR=${repos_dir}/functest +FUNCTEST_TEST_DIR=${repos_dir}/functest/functest/opnfv_tests FUNCTEST_CONF_DIR=/home/opnfv/functest/conf export PYTHONUNBUFFERED=1 @@ -81,39 +82,39 @@ function run_test(){ case $test_name in "healthcheck") - ${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh + ${FUNCTEST_TEST_DIR}/OpenStack/healthcheck/healthcheck.sh ;; "vping_ssh") - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m ssh $report + python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m ssh $report ;; "vping_userdata") - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m userdata $report + python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m userdata $report ;; "odl") odl_tests [[ "$report" == "-r" ]] && args=-p - ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \ + ${FUNCTEST_TEST_DIR}/Controllers/ODL/OpenDaylightTesting.py \ --keystoneip $keystone_ip --neutronip $neutron_ip \ --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \ --ospassword ${OS_PASSWORD} \ --odlip $odl_ip --odlwebport $odl_port ${args} ;; "tempest_smoke_serial") - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ + python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \ $clean_flag -s -m smoke $report ;; "tempest_full_parallel") - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ + python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \ $serial_flag $clean_flag -m full $report ;; "vims") - python ${FUNCTEST_REPO_DIR}/testcases/vnf/vIMS/vIMS.py $clean_flag $report + python ${FUNCTEST_TEST_DIR}/vnf/vIMS/vIMS.py $clean_flag $report ;; "rally_full") - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report + python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py $clean_flag all $report ;; "rally_sanity") - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py \ + python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py \ $clean_flag --sanity all $report ;; "bgpvpn") @@ -121,17 +122,17 @@ function run_test(){ python ${sdnvpn_repo_dir}/run_tests.py $report ;; "onos") - python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py + python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py ;; "onos_sfc") - python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -t sfc + python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py -t sfc ;; "promise") - python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report + python ${FUNCTEST_TEST_DIR}/features/promise.py $report sleep 10 # to let the instances terminate ;; "doctor") - python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py $report + python ${FUNCTEST_TEST_DIR}/features/doctor.py $report ;; "ovno") # suite under rewritting for colorado @@ -144,29 +145,29 @@ function run_test(){ python ${repos_dir}/securityscanning/security_scan.py --config ${repos_dir}/securityscanning/config.ini ;; "copper") - python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py $report + python ${FUNCTEST_TEST_DIR}/features/copper.py $report ;; "moon") python ${repos_dir}/moon/tests/run_tests.py $report ;; "multisite") - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/gen_tempest_conf.py - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ + python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/gen_tempest_conf.py + python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \ $clean_flag -s -m feature_multisite $report \ - -c ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/tempest_multisite.conf + -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf ;; "domino") - python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report + python ${FUNCTEST_TEST_DIR}/features/domino.py $report ;; "odl-sfc") - ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc + ODL_SFC_DIR=${FUNCTEST_TEST_DIR}/features/sfc # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $? source ${ODL_SFC_DIR}/tackerc python ${ODL_SFC_DIR}/sfc_colorado1.py $report ;; "parser") - python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report + python ${FUNCTEST_TEST_DIR}/vnf/vRNC/parser.py $report ;; *) echo "The test case '${test_name}' does not exist." diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 22509e611..afd329868 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -93,7 +93,7 @@ tiers: installer: '' scenario: 'odl' run: - module: 'functest.testcases.Controllers.ODL.OpenDaylightTesting' + module: 'functest.opnfv_tests.Controllers.ODL.OpenDaylightTesting' class: 'ODLTestCases' - |