From: Ed Kern <ejk@cisco.com>
Date: Wed, 2 May 2018 17:21:16 +0000 (-0600)
Subject: VPP: checkstyle before other verify jobs
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=91526438de212caeee3b3a12e30cee0bd7591ef3;p=ci-management.git

VPP: checkstyle before other verify jobs

This activates the checkstyle job before running the rest of
the verify set.  This is to avoid wasting time running jobs that
dont even pass checkstyle

Change-Id: If7a7d15d90f6d6eed323c8223a67b93932f3fb81
Signed-off-by: Ed Kern <ejk@cisco.com>
---

diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml
new file mode 100644
index 000000000..8708dedaf
--- /dev/null
+++ b/jjb/vpp/vpp-macros.yaml
@@ -0,0 +1,14 @@
+- trigger:
+    name: gerrit-trigger-checkstyle
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'checkstyle_success'
+            projects:
+                - project-compare-type: 'ANT'
+                  project-pattern: '{name}'
+                  branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
\ No newline at end of file
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 486227095..5ad2a97fe 100644
--- 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}'
 
@@ -437,6 +437,10 @@
             trigger-on:
                 - 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 +510,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 +570,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -721,7 +721,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -729,9 +729,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
@@ -892,7 +889,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -1043,7 +1040,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'