[Functest] Push logs to artifacts regardless if loop fails

This prevents from exiting the job without pushing the logs
to artifacts if the functest loop fails.

JIRA: FUNCTEST-443

Change-Id: I6925b5855326df809dbce9f389b10be8a00cf8de
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 8e3de3d..3070c25 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -276,6 +276,7 @@
         - 'set-functest-env'
         - 'functest-daily'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-weekly-builder
@@ -284,6 +285,7 @@
         - 'set-functest-env'
         - 'functest-weekly'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-suite-builder
@@ -291,6 +293,7 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-suite'
+        - 'functest-exit'
 
 - builder:
     name: functest-daily
@@ -327,3 +330,9 @@
     builders:
         - shell:
             !include-raw: ./functest-cleanup.sh
+
+- builder:
+    name: functest-exit
+    builders:
+        - shell:
+            !include-raw: ./functest-exit.sh
\ No newline at end of file

diff --git a/jjb/functest/functest-exit.sh b/jjb/functest/functest-exit.sh
new file mode 100644 (file)
index 0000000..f2aa2d0
--- /dev/null
+++ b/jjb/functest/functest-exit.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+branch=${GIT_BRANCH##*/}
+ret_val_file="${HOME}/opnfv/functest/results/${branch}/return_value"
+if [ ! -f ${ret_val_file} ]; then
+    echo "Return value not found!"
+    exit -1
+fi
+
+ret_val=`cat ${ret_val_file}`
+
+exit ret_val
\ No newline at end of file

diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh
index 5abddfd..7385623 100755 (executable)
--- a/jjb/functest/functest-loop.sh
+++ b/jjb/functest/functest-loop.sh
@@ -10,3 +10,9 @@ else
 fi
 container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
 docker exec $container_id $cmd
+
+ret_value=$?
+ret_val_file="${HOME}/opnfv/functest/results/${branch}/return_value"
+echo ${ret_value}>${ret_val_file}
+
+exit 0
\ No newline at end of file