summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-10-21 12:10:32 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-10-22 19:25:27 +0200
commitac6c1c4e595c9ce75f3bcaf65926be545334c144 (patch)
tree7c87e11deb888e3f728bae3cd343d2ad4aec9fe2 /jjb/functest
parent9a9e8d971c98f6ca94223c05070f1ad97f7ed50f (diff)
Stop running tempest full and scenario if healthcheck fails
JIRA: FUNCTEST-1010 Change-Id: I7a39fb38ecfb325c249224a9283d7db353668ccf Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest')
-rwxr-xr-xjjb/functest/functest-alpine.sh10
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