summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-02-15 18:06:31 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-15 18:06:31 +0000
commitbcd9ceb95ae851218ea938f5138098a855615046 (patch)
tree39b70de58f6495d8bde673211169ae131f681a2b /jjb
parent2863e503555a9b595f31dca1cdff050e82dec2bc (diff)
parente5671dffb1a7a3e080d3a0ba9b660a9bdd3e42c1 (diff)
Merge "Add jjob Functest timeout as input parameter, default 210"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-ci-jobs.yml6
1 files changed, 5 insertions, 1 deletions
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: