Merge "Remove Ubuntu 14.04 jobs"

[ci-management.git] / jjb / csit / csit.yaml

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index ad20943..8e15068 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -56,12 +56,6 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
-        - '1606':
-            branch: 'rls1606'
-            branch-id: 'oper-rls1606'
-        - '1609':
-            branch: 'rls1609'
-            branch-id: 'oper-rls1609'
         - '1701':
             branch: 'rls1701'
             branch-id: 'oper-rls1701'
@@ -104,8 +98,6 @@
     wrappers:
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -155,10 +147,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -279,10 +269,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -1269,10 +1257,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -1324,10 +1310,8 @@
             branch: '{branch}'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: 600
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '0 4 * * 0'
@@ -1373,10 +1357,8 @@
             branch: '{branch}'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: 600
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '0 4 * * 2,6'
@@ -1487,10 +1469,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -1550,10 +1530,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -1629,10 +1607,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -1721,10 +1697,8 @@
             branch: '{branch}'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H(17-20) * * *'
@@ -2113,10 +2087,8 @@
             branch: '{branch}'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H(17-20) * * 2,6'
@@ -2517,10 +2489,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -2604,10 +2574,8 @@
             branch: '{branch}'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H(0-2) * * *'
@@ -2694,10 +2662,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -2776,10 +2742,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-manually-triggered: