Merge "Add Honeycomb 18.01 branch"

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 382d1c3..10af0c8 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -49,9 +49,9 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
-        - '1710':
-            branch: 'rls1710'
-            branch-id: 'oper-rls1710'
+        - '1801':
+            branch: 'rls1801'
+            branch-id: 'oper-rls1801'
     stream:
         - master:
             branch: 'master'
@@ -68,6 +68,9 @@
         - '1710':
             branch: 'rls1710'
             branch-id: 'oper-rls1710'
+        - '1801':
+            branch: 'rls1801'
+            branch-id: 'oper-rls1801'
 
 
 - job-template:
@@ -98,8 +101,6 @@
     wrappers:
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -150,7 +151,7 @@
 
     wrappers:
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-perf-timeout}'
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -247,7 +248,7 @@
     name: 'csit-vpp-perf-{stream}-{type}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: true
 
     logrotate:
@@ -271,8 +272,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -1259,10 +1260,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:
@@ -1314,10 +1313,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'
@@ -1363,10 +1360,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'
@@ -1477,10 +1472,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:
@@ -1540,10 +1533,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:
@@ -1595,7 +1586,7 @@
     name: 'csit-report-merge-{stream}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: false
 
     logrotate:
@@ -1619,10 +1610,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:
@@ -1711,10 +1700,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) * * *'
@@ -2103,10 +2090,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'
@@ -2507,10 +2492,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:
@@ -2594,10 +2577,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) * * *'
@@ -2684,10 +2665,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:
@@ -2707,6 +2686,8 @@
                     comment-contains-value: 'verify-perf-vhost'
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-perf-memif'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-ipsechw'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -2766,10 +2747,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: