FIX vpp-csit-verify jobs

[ci-management.git] / jjb / vpp / vpp.yaml

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index d71b2ec..b8b45fc 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:
@@ -238,11 +238,15 @@
             branch: '{branch}'
 
     builders:
+        - 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
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
@@ -330,6 +334,9 @@
                 notbuilt: false
 
     builders:
+        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
+        - inject:
+            properties-file: variables.prop
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
@@ -700,10 +707,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}-s'
     concurrent: true
 
     logrotate:
@@ -737,6 +744,9 @@
             name: '{project}'
             branch: '{branch}'
             comment-trigger-value: 'test-cpoc'
+        - gerrit-trigger-trivial-patch-submitted-skip-vote:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
@@ -758,6 +768,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