diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-10-22 17:58:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-22 17:58:31 +0000 |
| commit | c93c3de0e7b8f766bde1bc86f719ad4b247d4f21 (patch) | |
| tree | 3376ab6e14a4ddae3277f8c31142a809079b8b38 | |
| parent | 9b164628deaf8bc495d4eabdb6458add7175cd32 (diff) | |
| parent | ac6c1c4e595c9ce75f3bcaf65926be545334c144 (diff) | |
Merge "Stop running tempest full and scenario if healthcheck fails"
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index c2cfed980..ef2a64903 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -43,6 +43,7 @@ run_tiers() { echo ${ret_value} > ${ret_val_file} if [ ${tier} == 'healthcheck' ]; then echo "Healthcheck tier failed. Exiting Functest..." + skip_tests=1 break fi fi @@ -186,6 +187,7 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then run_tiers ${tiers} else tests=(tempest_full tempest_scenario) + skip_tests=0 if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) @@ -202,7 +204,9 @@ else fi fi run_tiers ${tiers} - for test in "${tests[@]}"; do - run_test "$test" - done + if [ ${skip_tests} -eq 0 ]; then + for test in "${tests[@]}"; do + run_test "$test" + done + fi fi |