Add jjob Functest timeout as input parameter, default 210

[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 dfc44e3..9b04b04 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -53,6 +53,9 @@
 #--------------------------------
 #        master
 #--------------------------------
+        - opnfv-jump-2:
+            installer: fuel
+            <<: *master
         - intel-pod6:
             installer: joid
             <<: *master
@@ -109,7 +112,7 @@
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: 210
+            timeout: $JOB_TIMEOUT
             abort: true
 
     parameters:
@@ -123,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:
@@ -221,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
@@ -253,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/results/"
+            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"