diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-06 17:47:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-06 17:47:20 +0000 |
| commit | 3ad0c4bc46b80d6af267db792d8b0322cc581034 (patch) | |
| tree | 4bcef9358bf71277dec48394962263bd4feaaefe /ci | |
| parent | 40411080fa108a8e1f00007c7e56ba4f827c8ead (diff) | |
| parent | 30d7616a885a47dcc5c127b40d9b2df13d6aadb6 (diff) | |
Merge "Reduce logging in the SFC test case" into stable/colorado
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/exec_test.sh | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index deb505df9..e402e0c31 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -147,18 +147,11 @@ function run_test(){ python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report ;; "odl-sfc") - bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/server_presetup_CI.bash - ret_val=$? - if [ $ret_val != 0 ]; then - exit $ret_val - fi - bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/compute_presetup_CI.bash - ret_val=$? - if [ $ret_val != 0 ]; then - exit $ret_val - fi - source ${FUNCTEST_REPO_DIR}/testcases/features/sfc/tackerc - python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py $report + ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc + # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash + FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} bash ${ODL_SFC_DIR}/prepare_odl_sfc.bash || exit $? + source ${ODL_SFC_DIR}/tackerc + python ${ODL_SFC_DIR}/sfc.py $report ;; "parser") python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report |