X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=6520709f1a466947104b6635f8c49ae3f4517465;hb=a15a3e326186c5731e145ab45a7cd37a778a4647;hp=95dd949248508b5cdbd7e1d1b107ecabfe00914e;hpb=6358d938de130c839f0fc0582f8c35aa17fb20b1;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 95dd94924..6520709f1 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -3,7 +3,6 @@
     name: vpp
     jobs:
         - 'vpp-verify-{stream}-{os}'
-        - 'vpp-verify-{stream}-clang'
         - 'vpp-merge-{stream}-{os}'
         - 'vpp-verify-os-{stream}-{os}'
         - 'vpp-merge-os-{stream}-{os}'
@@ -38,6 +37,28 @@
         - short
         - long
 
+- project:
+    name: vpp-clang
+    jobs:
+        - 'vpp-verify-{stream}-clang'
+
+    project: 'vpp'
+    os:
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+      - centos7:
+          repo-os-part: 'centos7'
+      - opensuse:
+          repo-os-part: 'opensuse'
+
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - '1804':
+            branch: 'stable/1804'
+            repo-stream-part: 'stable.1804'
+
 - project:
     name: vpp-misc
     jobs:
@@ -62,7 +83,7 @@
     os: ubuntu1604
 
 - project:
-    name: vpp-beta
+    name: vpp-master-only
     jobs:
         - 'vpp-beta-verify-{stream}-{os}'
     project: 'vpp'
@@ -91,7 +112,7 @@
             repo-stream-part: 'stable.1804'
     os:
       - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+          repo-os-part: 'ubuntu-arm.xenial.main'
 
 - job-template:
     name: 'vpp-beta-verify-{stream}-{os}'
@@ -166,7 +187,7 @@
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -204,22 +225,10 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'armcheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'checkstyle_success'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{project}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-            override-votes: true
-            gerrit-build-notbuilt-verified-value: 0
-            notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.'
+        - gerrit-trigger-trivial-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
     builders:
         - shell:
             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -238,7 +247,7 @@
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -281,20 +290,9 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'armmerge'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{project}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-            override-votes: true
-            gerrit-build-notbuilt-verified-value: 0
-            notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.'
+        - gerrit-trigger-patch-merged:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - config-file-provider:
@@ -339,7 +337,7 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -475,7 +473,7 @@
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 2
             fixed-delay: 90
 
@@ -529,7 +527,7 @@
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -682,7 +680,7 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -846,7 +844,7 @@
             maven-version: 'mvn33-new'
 
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -1085,7 +1083,7 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -1168,7 +1166,7 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -1236,7 +1234,7 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
 
@@ -1319,7 +1317,7 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90