From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 28 Sep 2017 09:16:31 +0000 (+0000)
Subject: Merge "[Functest] Block daily job if healthcheck fails"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2461f04429ade8ec5046e9a0d77cdd11db11e75b;hp=-c;p=releng.git

Merge "[Functest] Block daily job if healthcheck fails"
---

2461f04429ade8ec5046e9a0d77cdd11db11e75b
diff --combined jjb/functest/functest-alpine.sh
index fdc34810a,9a415ff04..ffd86f876
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -5,9 -5,8 +5,9 @@@ set +
  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}
  
@@@ -20,15 -19,19 +20,19 @@@
          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
@@@ -43,7 -46,7 +47,7 @@@
              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"