From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 4 Sep 2018 17:07:30 +0000 (+0000)
Subject: Merge "xci: Log functest results to console for daily jobs"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=654bd03af21b420227068465dc7cb89ab471b308;hp=-c;p=releng.git

Merge "xci: Log functest results to console for daily jobs"
---

654bd03af21b420227068465dc7cb89ab471b308
diff --combined jjb/xci/xci-daily-jobs.yaml
index 6e5135439,cfe7cb14a..5f75b0e28
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@@ -154,7 -154,7 +154,7 @@@
            default: 'tier'
        - string:
            name: FUNCTEST_SUITE_NAME
 -          default: 'healthcheck'
 +          default: 'smoke'
        - string:
            name: CI_LOOP
            default: 'daily'
@@@ -283,7 -283,7 +283,7 @@@
            default: 'tier'
        - string:
            name: FUNCTEST_SUITE_NAME
 -          default: 'healthcheck'
 +          default: 'smoke'
        - string:
            name: CI_LOOP
            default: 'daily'
@@@ -347,10 -347,29 +347,29 @@@
      builders:
        - shell: |
            #!/bin/bash
-           set -o errexit
            set -o pipefail
  
            ssh root@192.168.122.2 "/root/run-functest.sh"
+           functest_exit=$?
+ 
+           case ${DEPLOY_SCENARIO[0]} in
+               os-*)
+                   FUNCTEST_LOG=/root/functest-results/functest.log
+                   ;;
+               k8-*)
+                   FUNCTEST_LOG=/root/functest-results/functest-kubernetes.log
+                   ;;
+               *)
+                   echo "Unable to determine the installer. Exiting!"
+                   exit $functest_exit
+                   ;;
+           esac
+ 
+           echo "Functest log"
+           echo "---------------------------------------------------------------------------------"
+           ssh root@192.168.122.2 "cat $FUNCTEST_LOG"
+           echo "---------------------------------------------------------------------------------"
+           exit ${functest_exit}
  - builder:
      name: 'xci-daily-yardstick-macro'
      builders: