Merge "Add jjob Functest timeout as input parameter, default 210"

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 1165b2a..9b04b04 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -112,7 +112,7 @@
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: 210
+            timeout: $JOB_TIMEOUT
             abort: true
 
     parameters:
@@ -126,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: