summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-20 12:43:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-20 12:43:37 +0000
commit475b0290a9b3f8c95dba73ca25aafc483e38852c (patch)
tree2bc1ade8575063a3a81a44a69880907bcb19ffba /jjb
parentd6f0f83e2fcf01911f5745bd597b4abdab3ca35f (diff)
parentb27e2c90fc02ab58998d0114cf64c9749b538dcb (diff)
Merge "Add default deployment timeout for fuel jobs"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 056b2cc0f..1c7946a87 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -214,6 +214,10 @@
default: 'os-odl_l2-nofeature-ha'
- fuel-ci-parameter:
gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_TIMEOUT
+ default: '150'
+ description: 'Deployment timeout in minutes'
scm:
- git-scm:
@@ -224,9 +228,6 @@
wrappers:
- build-name:
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
- - timeout:
- timeout: 150
- abort: true
builders:
- description-setter: