diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/exec_test.sh | 15 | ||||
| -rw-r--r-- | ci/testcases.yaml | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index d9f169c15..82a7a31bc 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -116,7 +116,20 @@ function run_test(){ $clean_flag --sanity all $report ;; "bgpvpn") - python ${repos_dir}/sdnvpn/test/functest/run_tests.py + 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 diff --git a/ci/testcases.yaml b/ci/testcases.yaml index b4d9b07e9..55d099c9c 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -56,7 +56,7 @@ tiers: the OpenStack deplopyment. dependencies: installer: '' - scenario: '' + scenario: '^(?!.*bgpvpn).*$' - name: rally_sanity |