Change publisher on one vpp-csit job

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 9f89750..a80043d 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -188,7 +188,10 @@
     executor: 'vpp-csit-device'
     skip-vote: 'false'
     stream:
-      # TODO: Add stable/1908 when it is created.
+      # Only master and LTS branches.
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
       - master:
           branch: 'master'
     os: ubuntu1804
@@ -267,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}'
@@ -409,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}'
@@ -592,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}'
@@ -638,11 +629,11 @@
           build-timeout: 120
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'betacheck'
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'betacheck'
+          name: '{project}'
+          branch: '{branch}'
+
     builders:
       - shell:
           !include-raw-escape:
@@ -717,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'
@@ -777,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}'
@@ -959,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}'
@@ -1007,11 +986,11 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'betamerge'
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'betamerge'
+          name: '{project}'
+          branch: '{branch}'
+
     builders:
       - config-file-provider:
           files:
@@ -1128,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
@@ -1180,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:
@@ -1199,8 +1183,7 @@
       - robot-report:
           output-path: 'csit_current/0/'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
 
 - job-template:
     name: 'vpp-csit-verify-api-crc-{stream}'