From 0c9279789235541dfeb27e316c80152e8100e451 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 14 Mar 2018 16:13:00 +0100 Subject: xci: Log functest output before failure When functest fails, the job exits directly without us logging the functest output to console. [1] Grepping functest log for FAIL for determining the result helps us to cat the log before exiting with right exit code. [1] https://build.opnfv.org/ci/job/xci-verify-ubuntu-healthcheck-virtual-master/509/console Change-Id: I01e3dcc51321e935b1722b749e8caf7ec5ad755b Signed-off-by: Fatih Degirmenci --- jjb/xci/xci-run-functest.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'jjb/xci') diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 60b48cf7f..2e343631b 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -7,9 +7,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -set -o errexit set -o nounset -set -o pipefail #---------------------------------------------------------------------- # This script is used by CI and executed by Jenkins jobs. @@ -58,3 +56,8 @@ echo "Functest log" echo "---------------------------------------------------------------------------------" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat /root/results/functest.log" echo "---------------------------------------------------------------------------------" +# check the log to see if we have any error +if ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "grep -q 'FAIL' /root/results/functest.log"; then + echo "Error: Functest failed!" + exit 1 +fi -- cgit 1.2.3-korg