From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Mon, 15 Feb 2016 18:06:31 +0000 (+0000)
Subject: Merge "Add jjob Functest timeout as input parameter, default 210"
X-Git-Tag: brahmaputra.1.0~40
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bcd9ceb95ae851218ea938f5138098a855615046;hp=2863e503555a9b595f31dca1cdff050e82dec2bc;p=releng.git

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 1165b2a2c..9b04b048a 100644
--- 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: