diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8ede529a1..ffd86f876 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -5,8 +5,9 @@ set +u set +o pipefail run_tiers() { - cmd_opt='prepare_env start && run_tests -r -t all' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t all' + tiers=$1 + cmd_opt="prepare_env start && run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -19,15 +20,19 @@ run_tiers() { eval ${cmd} ret_value=$? if [ ${ret_value} != 0 ]; then - echo ${ret_value} > ${ret_val_file} + echo ${ret_value} > ${ret_val_file} + if [ ${tier} == 'healthcheck' ]; then + echo "Healthcheck tier failed. Exiting Functest..." + exit 1 + fi fi done } run_test() { test_name=$1 - cmd_opt='prepare_env start && run_tests -r -t $test_name' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t $test_name' + cmd_opt="prepare_env start && run_tests -r -t ${test_name}" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t ${test_name}" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case @@ -42,7 +47,7 @@ run_test() { FUNCTEST_IMAGE=opnfv/functest-vnf ;; promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd) FUNCTEST_IMAGE=opnfv/functest-features ;; - parser) + parser-basics) FUNCTEST_IMAGE=opnfv/functest-parser ;; *) echo "Unkown test case $test_name" |