VPP: fixed retry on container builds

In mental snap I applied the retry on openstack based builds
and not container builds.  This will remove it from openstack
builds and properly apply it to container builds.

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index c18412e..e62e294 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -118,6 +118,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-verify-os-{stream}-{os}'
@@ -179,10 +183,6 @@
         - 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}'
@@ -274,6 +274,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-merge-os-{stream}-{os}'
@@ -363,10 +367,6 @@
             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}'