VPP: This moves verify merge jobs to cpoc build

This change will also enable a single retry per build.

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 1801513..c18412e 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -60,7 +60,7 @@
     name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
+    node: '{os}-us'
     concurrent: true
 
     logrotate:
@@ -99,6 +99,8 @@
             !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:
             !include-raw-escape:
                 - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -177,12 +179,16 @@
         - 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-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
+    node: '{os}-us'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -239,6 +245,8 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -355,12 +363,16 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10
 
 - job-template:
     name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
+    node: '{os}-us'
     concurrent: true
 
     logrotate:
@@ -426,6 +438,12 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10
+
+
 - job-template:
     name: 'vpp-csit-verify-os-virl-{stream}'
 
@@ -601,7 +619,7 @@
     name: 'vpp-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: ubuntu1604-us
     concurrent: true
 
     logrotate:
@@ -646,6 +664,8 @@
         - provide-maven-settings:
             settings-file: 'vpp-settings'
             global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape: include-raw-vpp-docs.sh
     publishers:
@@ -657,12 +677,16 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10
 
 - job-template:
     name: 'vpp-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: ubuntu1604-us
     concurrent: true
 
     logrotate:
@@ -723,6 +747,8 @@
         - provide-maven-settings:
             settings-file: 'vpp-settings'
             global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape: include-raw-vpp-docs.sh
     publishers:
@@ -734,12 +760,17 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10
+
 
 - job-template:
     name: 'vpp-make-test-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: ubuntu1604-us
     concurrent: true
 
     logrotate:
@@ -784,6 +815,8 @@
         - provide-maven-settings:
             settings-file: 'vpp-settings'
             global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape: include-raw-vpp-make-test-docs.sh
     publishers:
@@ -795,12 +828,16 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10
 
 - job-template:
     name: 'vpp-make-test-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-basebuild-8c-32g
+    node: ubuntu1604-us
     concurrent: true
 
     logrotate:
@@ -861,6 +898,8 @@
         - provide-maven-settings:
             settings-file: 'vpp-settings'
             global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape: include-raw-vpp-make-test-docs.sh
     publishers:
@@ -872,6 +911,10 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 10
 
 - job-template:
     name: 'vpp-promote-{stream}-{os}'
@@ -945,7 +988,7 @@
     name: 'vpp-cpoc-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-s'
+    node: '{os}-us'
     concurrent: true
 
     logrotate:
@@ -979,9 +1022,6 @@
             name: '{project}'
             branch: '{branch}'
             comment-trigger-value: 'test-cpoc'
-        - gerrit-trigger-trivial-patch-submitted-skip-vote:
-            name: '{project}'
-            branch: '{branch}'
 
     builders:
         - shell: