Fix JOB_TIMEOUT variable for functest jobs

[releng.git] / jjb / functest / functest-ci-jobs.yml

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 10ea72b..2912eb8 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -23,6 +23,9 @@
 #        brahmaputra
 #--------------------------------
     pod:
+        - opnfv-jump-1:
+            installer: apex
+            <<: *brahmaputra
         - opnfv-jump-2:
             installer: fuel
             <<: *brahmaputra
@@ -35,6 +38,9 @@
         - ericsson-pod1:
             installer: fuel
             <<: *brahmaputra
+        - ericsson-pod2:
+            installer: fuel
+            <<: *brahmaputra
         - virtual:
             installer: fuel
             <<: *brahmaputra
@@ -47,6 +53,9 @@
 #--------------------------------
 #        master
 #--------------------------------
+        - opnfv-jump-2:
+            installer: fuel
+            <<: *master
         - intel-pod6:
             installer: joid
             <<: *master
@@ -92,9 +101,19 @@
 - job-template:
     name: 'functest-{installer}-{pod}-{testsuite}-{stream}'
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: '$JOB_TIMEOUT'
+            abort: true
 
     parameters:
         - project-parameter:
@@ -107,6 +126,10 @@
             default: 'os-odl_l2-nofeature-ha'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: JOB_TIMEOUT
+            default: '210'
+            description: "Job build timeout"
 
     scm:
         - git-scm:
@@ -205,7 +228,6 @@
             if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
                 flag="-r"
             fi
-            echo "Functest: running all the tests"
             cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}"
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
@@ -237,8 +259,8 @@
             envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
                 -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
                 -e CI_DEBUG=${CI_DEBUG}"
-
-            dir_result="${HOME}/opnfv/functest/reports"
+            branch=${GIT_BRANCH##*/}
+            dir_result="${HOME}/opnfv/functest/results/${branch}"
             mkdir -p ${dir_result}
             sudo rm -rf ${dir_result}/*
             res_volume="-v ${dir_result}:/home/opnfv/functest/results"
@@ -272,7 +294,7 @@
     name: functest-store-results
     builders:
         - shell:
-            !include-raw: res-build.sh
+            !include-raw: ../../utils/push-test-logs.sh
 
 - builder:
     name: functest-cleanup