From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Tue, 20 Sep 2016 12:43:36 +0000 (+0000)
Subject: Merge "Add default deployment timeout for fuel jobs"
X-Git-Tag: colorado.1.0~6
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=475b0290a9b3f8c95dba73ca25aafc483e38852c;hp=d6f0f83e2fcf01911f5745bd597b4abdab3ca35f;p=releng.git

Merge "Add default deployment timeout for fuel jobs"
---

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: