From: Fedor Zhadaev <fzhadaev@mirantis.com>
Date: Mon, 19 Sep 2016 13:33:15 +0000 (+0300)
Subject: Add default deployment timeout for fuel jobs
X-Git-Tag: colorado.1.0~6^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=b27e2c90fc02ab58998d0114cf64c9749b538dcb

Add default deployment timeout for fuel jobs

Add deployment timeout value, less than CI job timeout.

Change-Id: I9725e7cb68dfa7b1c5a0f87d277e21af11b9ff10
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
---

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: