set timeout in functest and yardstick

[releng.git] / jjb / yardstick / yardstick-ci-jobs.yml

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 779886d..ec5c547 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -26,34 +26,47 @@
         - opnfv-jump-1:
             installer: apex
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - opnfv-jump-2:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - intel-pod5:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - huawei-us-deploy-bare-1:
             installer: compass
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - ericsson-pod1:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            <<: *brahmaputra
+        - ericsson-pod2:
+            installer: fuel
+            suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - virtual:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - huawei-virtual:
             installer: compass
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - virtual:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
 #--------------------------------
 #        master
@@ -61,46 +74,57 @@
         - ericsson-pod1:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - ericsson-pod1:
             installer: fuel
             suite: vtcdaily
+            auto-trigger-name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
             <<: *master
         - ericsson-pod2:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - intel-pod6:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - intel-pod8:
             installer: compass
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - zte-build-1:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'yardstick-daily-zte-build-1-trigger'
             <<: *master
         - orange-pod2:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - opnfv-jump-1:
             installer: apex
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - virtual:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
-        - virtual:
+        - huawei-virtual:
             installer: compass
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - virtual:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
 #--------------------------------
 
@@ -125,9 +149,12 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 180
+            abort: true
 
     triggers:
-        - 'yardstick-{pod}-trigger'
+        - '{auto-trigger-name}'
 
     parameters:
         - project-parameter:
@@ -357,61 +384,11 @@
 #######################
 # trigger for PODs to only run yardstick test suites
 - trigger:
-    name: 'yardstick-zte-build-1-trigger'
+    name: 'yardstick-daily-zte-build-1-trigger'
     triggers:
         - timed: '0 2 * * *'
 
 - trigger:
-    name: 'yardstick-intel-pod5-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-intel-pod6-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-intel-pod8-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-ericsson-pod1-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-ericsson-pod2-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-opnfv-jump-1-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-opnfv-jump-2-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-huawei-us-deploy-bare-1-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-orange-pod2-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-virtual-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-huawei-virtual-trigger'
+    name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 1 * * *'