Merge "Add CSIT rls1908_2 branch"

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

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 5944311..dcce387 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -45,6 +45,19 @@
             - 3n-dnv
             - 3n-tsh:
                executor: 'ubuntu1804arm-us'
+          stream:
+            - master:
+                branch: 'master'
+                branch-id: 'oper'
+            - '1908_1':
+                branch: 'rls1908_1'
+                branch-id: 'oper-rls1908_1'
+            - '1908_2':
+                branch: 'rls1908_2'
+                branch-id: 'oper-rls1908_2'
+            - '2001':
+                branch: 'rls2001'
+                branch-id: 'oper-rls2001'
       - 'csit-vpp-perf-mrr-daily-master{node-arch}':
           node-arch:
             - '':
@@ -61,7 +74,7 @@
                 periodicity: '0 14 * * *'
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                periodicity: '0 14 * * 6'
+                periodicity: '0 14 * * *'
       - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
           node-arch:
             - 2n-clx
@@ -71,9 +84,9 @@
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '1908':
-                branch: 'rls1908'
-                branch-id: 'oper-rls1908'
+            - '1908_2':
+                branch: 'rls1908_2'
+                branch-id: 'oper-rls1908_2'
           periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
@@ -93,9 +106,9 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1908_1':
-          branch: 'rls1908_1'
-          branch-id: 'oper-rls1908_1'
+      - '1908_2':
+          branch: 'rls1908_2'
+          branch-id: 'oper-rls1908_2'
       - '2001':
           branch: 'rls2001'
           branch-id: 'oper-rls2001'
@@ -193,22 +206,11 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'csit-{node-arch}-perftest'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
+      - gerrit-trigger-csit-perftest:
+          project: '{project}'
+          branch: '{branch}'
+          trigger-word: 'csit-{node-arch}-perftest'
+          skip-vote: false
 
     builders:
       - shell: