VPP: cpoc out of test but still skip vote

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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index be96bd9..f4b5780 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -216,6 +216,33 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
 
+- trigger:
+    name: gerrit-trigger-trivial-patch-submitted-skip-vote
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'true'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+                - project-compare-type: 'ANT'
+                  project-pattern: '{name}'
+                  branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
 - trigger:
     name: gerrit-trigger-manually-triggered
     triggers:

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 5742367..7176ff8 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -9,7 +9,7 @@
         - 'vpp-make-test-docs-merge-{stream}'
         - 'vpp-make-test-docs-verify-{stream}'
         - 'vpp-promote-{stream}-{os}'
-        - 'vpp-test-poc-verify-{stream}-{os}'
+        - 'vpp-cpoc-verify-{stream}-{os}'
 
     project: 'vpp'
     os:
@@ -706,10 +706,10 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'vpp-test-poc-verify-{stream}-{os}'
+    name: 'vpp-cpoc-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-m'
+    node: '{os}-us'
     concurrent: true
 
     logrotate:
@@ -743,6 +743,9 @@
             name: '{project}'
             branch: '{branch}'
             comment-trigger-value: 'test-cpoc'
+        - gerrit-trigger-trivial-patch-submitted-skip-vote:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
@@ -764,6 +767,9 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
-        - retry-build-on-builder-error
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10