Merge "add one click deployment of testapi and reporting"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4162c9e..bed67f4 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -1300,7 +1300,7 @@
                 - 'apex-run.*'
 
     triggers:
-        - timed: '0 12 * * *'
+        - timed: '0 1 * * *'
 
     builders:
         - description-setter:

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index a8fc70f..3c36e8f 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -1170,7 +1170,7 @@
                 - 'apex-run.*'
 
     triggers:
-        - timed: '0 12 * * *'
+        - timed: '0 1 * * *'
 
     builders:
         - description-setter:

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 81aee0d..c948430 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -86,6 +86,8 @@ else
 fi
 
 cmd_opt='prepare_env start && run_tests -r -t all'
+ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
+echo 0 > ${ret_val_file}
 
 for tier in ${tiers[@]}; do
     FUNCTEST_IMAGE=opnfv/functest-${tier}
@@ -94,4 +96,8 @@ for tier in ${tiers[@]}; do
     cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
     echo "Running Functest tier '${tier}'. CMD: ${cmd}"
     eval ${cmd}
+    ret_value=$?
+    if [ ${ret_value} != 0 ]; then
+      echo ${ret_value} > ${ret_val_file}
+    fi
 done

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 0d504f3..ea39de4 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -380,6 +380,7 @@
         - 'functest-cleanup'
         - 'functest-daily'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-arm-daily-builder