Merge "VPP: Add CRC checking to older branches"

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 7a553aa..092c3c2 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -270,10 +270,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
 
 - job-template:
     name: 'vpp-historic-merge-{stream}-{os}'
@@ -412,10 +408,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
 
 - job-template:
     name: 'vpp-arm-merge-{stream}-{os}'
@@ -595,10 +587,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: true
-          max-failed-builds: 1
-          fixed-delay: 90
 
 - job-template:
     name: 'vpp-beta-verify-{stream}-{os}'
@@ -720,10 +708,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 2
-          fixed-delay: 90
 
 - job-template:
     name: 'vpp-verify-{stream}-clang'
@@ -780,10 +764,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
 
 - job-template:
     name: 'vpp-coverity-{stream}'
@@ -962,10 +942,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90
 
 - job-template:
     name: 'vpp-beta-merge-{stream}-{os}'
@@ -1131,6 +1107,10 @@
               <ul>
                   <li>{executor}
               </ul>
+          <li>Objective
+          Contrary to csit-vpp job, this also measures the parent performance,
+          and fails if performance regression is detected.
+          See https://github.com/FDio/csit/blob/master/docs/cpta/methodology/perpatch_performance_tests.rst
       </ul>
 
     project-type: freestyle
@@ -1183,9 +1163,10 @@
 
     triggers:
       - gerrit-trigger-csit-perftest:
-          name: '{project}'
+          project: '{project}'
           branch: '{branch}'
-          node-arch: '{node-arch}'
+          trigger-word: 'perftest-{node-arch}'
+          skip-vote: true
 
     builders:
       - shell: