From: meimei <meimei@huawei.com>
Date: Wed, 3 Feb 2016 08:23:15 +0000 (+0800)
Subject: set timeout in functest and yardstick
X-Git-Tag: brahmaputra.1.0~73
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b4444d64dcfd8250a23242266c07d6dbb17ec61a;hp=b85205c634c18373eb75560166f69fe94e223032;p=releng.git

set timeout in functest and yardstick

Change-Id: I2f7cec73be482122d3ff7409eae6d514838a0e3e
Signed-off-by: meimei <meimei@huawei.com>
---

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index eb9f58a84..ff4482d71 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -74,9 +74,6 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 360
-            fail: true
 
     parameters:
         - project-parameter:
@@ -145,6 +142,9 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 120
+            abort: true
 
     parameters:
         - project-parameter:
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 2e95e9f12..dfc44e3e1 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -108,6 +108,9 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 210
+            abort: true
 
     parameters:
         - project-parameter:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 8a5546d80..ec5c547ee 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -149,6 +149,9 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 180
+            abort: true
 
     triggers:
         - '{auto-trigger-name}'