VPP: make checkstyle job production for beta and arm job

This is the next step in the checkstyle job advancement.  It
will now trigger both osleap15 and ubuntu1804 job along with
the arm ubuntu1604 job. All of these remain skip vote. This
change just goes from comment trigger to patchset trigger.

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 0ba4b92..d0e1da4 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -68,8 +68,6 @@
           repo-os-part: 'ubuntu.bionic.main'
       - osleap15:
           repo-os-part: 'osleap15'
-      - osleap423:
-          repo-os-part: 'osleap423'
 
 - project:
     name: vpp-arm
@@ -156,6 +154,10 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10
 
 - job-template:
     name: 'vpp-arm-verify-{stream}-{os}'
@@ -196,6 +198,8 @@
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'armcheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'checkstyle_success'
             projects:
                 - project-compare-type: 'ANT'
                   project-pattern: '{project}'
@@ -209,10 +213,6 @@
                 notbuilt: true
 
     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:
@@ -267,6 +267,10 @@
         - gerrit:
             server-name: 'Primary'
             trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
                 - patchset-uploaded-event: 'false'
                 - comment-added-contains-event:
                     comment-contains-value: 'checkstylecheck'