Merge "CSIT-PERF: New trigger design"

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 4862270..b12afd8 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -106,7 +106,7 @@
     node: '{os}-us'
     concurrent: true
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -282,7 +282,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -435,8 +435,17 @@
         - gerrit:
             server-name: 'Primary'
             trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'checkstylecheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
             projects:
                 - project-compare-type: 'ANT'
                   project-pattern: '{project}'
@@ -506,15 +515,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-test-checkstyle.sh
         - shell:
             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
@@ -570,7 +575,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -721,7 +726,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -729,9 +734,6 @@
         - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
         - inject:
             properties-file: variables.prop
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -797,23 +799,7 @@
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-l2'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip4'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip6'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-lisp'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-vxlan'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-vhost'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-acl'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-memif'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ipsechw'
+                    comment-contains-value: 'perftest'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -892,7 +878,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -1043,7 +1029,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'