diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_functest.yaml | 1 | ||||
| -rwxr-xr-x | ci/exec_test.sh | 18 | ||||
| -rw-r--r-- | ci/generate_report.py | 17 | ||||
| -rwxr-xr-x | ci/run_tests.py | 15 | ||||
| -rw-r--r-- | ci/testcases.yaml | 12 |
5 files changed, 30 insertions, 33 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index 953d69023..e4468208e 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -23,6 +23,7 @@ general: dir_repo_copper: /home/opnfv/repos/copper dir_repo_ovno: /home/opnfv/repos/ovno dir_repo_parser: /home/opnfv/repos/parser + dir_repo_domino: /home/opnfv/repos/domino dir_functest: /home/opnfv/functest dir_results: /home/opnfv/functest/results dir_functest_conf: /home/opnfv/functest/conf diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 800b44ab4..cd5ae1822 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -116,24 +116,14 @@ function run_test(){ $clean_flag --sanity all $report ;; "bgpvpn") - sdnvpn_repo_dir=${repos_dir}/sdnvpn/test/functest/ - # Copy blacklist from sdnvpn repo to the proper place to execute functest - src=${sdnvpn_repo_dir}/tempest_blacklist.txt - dst=${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/custom_tests/blacklist.txt - cp $src $dst - # Execute tempest smoke with blacklist - python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ - $clean_flag -s -m smoke $report - # Remove blacklist file - rm $dst - - # Execute SDNVPN test cases python ${sdnvpn_repo_dir}/run_tests.py $report - ;; "onos") python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py - ;; + ;; + "onos_sfc") + python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -t sfc + ;; "promise") python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report sleep 10 # to let the instances terminate diff --git a/ci/generate_report.py b/ci/generate_report.py index 53aef0c9e..3ca2847bd 100644 --- a/ci/generate_report.py +++ b/ci/generate_report.py @@ -35,8 +35,12 @@ def get_results_from_db(): url = 'http://testresults.opnfv.org/test/api/v1/results?build_tag=' + \ BUILD_TAG logger.debug("Query to rest api: %s" % url) - data = json.load(urllib2.urlopen(url)) - return data['results'] + try: + data = json.load(urllib2.urlopen(url)) + return data['results'] + except: + logger.error("Cannot read content from the url: %s" % url) + return None def get_data(test, results): @@ -90,10 +94,11 @@ def main(args): if IS_CI_RUN: results = get_results_from_db() - for test in executed_test_cases: - data = get_data(test, results) - test.update({"url": data['url'], - "result": data['result']}) + if results is not None: + for test in executed_test_cases: + data = get_data(test, results) + test.update({"url": data['url'], + "result": data['result']}) TOTAL_LEN = COL_1_LEN + COL_2_LEN + COL_3_LEN + COL_4_LEN if IS_CI_RUN: diff --git a/ci/run_tests.py b/ci/run_tests.py index 383a20f9f..758a87c2d 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -128,8 +128,6 @@ def run_test(test, tier_name): update_test_info(test_name, result_str, duration_str) - return result - def run_tier(tier): tier_name = tier.get_name() @@ -144,11 +142,7 @@ def run_tier(tier): print_separator("#") logger.debug("\n%s" % tier) for test in tests: - res = run_test(test, tier_name) - if res != 0: - return res - - return 0 + run_test(test, tier_name) def run_all(tiers): @@ -173,12 +167,9 @@ def run_all(tiers): logger.info("Tests to be executed:%s" % summary) EXECUTED_TEST_CASES = generate_report.init(tiers_to_run) for tier in tiers_to_run: - res = run_tier(tier) - if res != 0: - return res - generate_report.main(EXECUTED_TEST_CASES) + run_tier(tier) - return 0 + generate_report.main(EXECUTED_TEST_CASES) def main(): diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 634d041b0..315969ae7 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -60,7 +60,7 @@ tiers: the OpenStack deplopyment. dependencies: installer: '' - scenario: '^(?!.*bgpvpn).*$' + scenario: '' - name: rally_sanity @@ -198,6 +198,16 @@ tiers: dependencies: installer: 'fuel' scenario: 'odl_l2-sfc' + - + name: onos_sfc + criteria: 'status == "PASS"' + blocking: true + description: >- + Test Suite for onos-sfc to test sfc function. + dependencies: + installer: '' + scenario: 'onos-sfc' + - name: openstack order: 4 |