X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=4cd56a7dcc539da06d770305d157959d99ca1155;hb=a247aa6703f3a09c0bcd74fd403c38876d5f3db3;hp=36e12c0b1ab3b8a54985c40265caaf0ba11c1d5d;hpb=6d059c01615ba99ef89c5f0c89e051fb43fad2d0;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 36e12c0b1..4cd56a7dc 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -12,8 +12,6 @@
 
     project: 'vpp'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
         - centos7:
@@ -37,6 +35,9 @@
         - '1704':
             branch: 'stable/1704'
             repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
     type:
         - short
         - long
@@ -45,7 +46,7 @@
     name: vpp-misc
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
-        - 'vpp-csit-verify-hw-perf-{stream}-{type}'
+        - 'vpp-csit-verify-hw-perf-{stream}'
     project: 'vpp'
     stream:
         - master:
@@ -66,11 +67,11 @@
         - '1704':
             branch: 'stable/1704'
             repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
     os: ubuntu1604
-    type:
-        - all
-        - short
-        - long
+
 
 - job-template:
     name: 'vpp-verify-{stream}-{os}'
@@ -215,6 +216,8 @@
             maven: 'mvn33-new'
         - maven-exec:
             maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -234,6 +237,10 @@
             branch: '{branch}'
 
     builders:
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/home/jenkins'
         - maven-target:
             maven-version: 'mvn33-new'
             goals: '--version'
@@ -254,6 +261,10 @@
             !include-raw-escape:
                 - ../scripts/maven_push_functions.sh
                 - include-raw-vpp-maven-push.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
+
     publishers:
         - archive:
             artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
@@ -306,13 +317,15 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
+            !include-raw-escape:
+                - include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-csit-functional.sh
+            !include-raw-escape:
+                - include-raw-vpp-csit-functional.sh
 
     publishers:
         - archive-artifacts:
@@ -326,7 +339,7 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
+    name: 'vpp-csit-verify-hw-perf-{stream}'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
@@ -347,8 +360,6 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.ubuntu.xenial.main'
-        - type-parameter:
-            type: '{type}'
         - is-csit-vpp-job-parameter:
             is-csit-vpp-job: 'True'
 
@@ -363,10 +374,32 @@
             build-timeout: 30
 
     triggers:
-        - gerrit-trigger-manually-triggered:
-            comment-trigger-value: 'verify-perf-{type}'
-            name: '{project}'
-            branch: '{branch}'
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'vpp-verify-perf-l2'
+                - comment-added-contains-event:
+                    comment-contains-value: 'vpp-verify-perf-ip4'
+                - comment-added-contains-event:
+                    comment-contains-value: 'vpp-verify-perf-ip6'
+                - comment-added-contains-event:
+                    comment-contains-value: 'vpp-verify-perf-lisp'
+                - comment-added-contains-event:
+                    comment-contains-value: 'vpp-verify-perf-vxlan'
+                - comment-added-contains-event:
+                    comment-contains-value: 'vpp-verify-perf-vhost'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: false
+                failed: false
+                unstable: false
+                notbuilt: false
 
     builders:
         - shell:
@@ -374,7 +407,8 @@
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-csit-verify-perf.sh
+            !include-raw-escape:
+                - include-raw-vpp-csit-verify-perf.sh
 
     publishers:
         - archive-artifacts:
@@ -491,9 +525,6 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - reverse:
-            jobs: 'vpp-merge-{stream}-ubuntu1404'
-            result: 'success'
         - gerrit:
             server-name: 'Primary'
             trigger-on:
@@ -629,9 +660,6 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - reverse:
-            jobs: 'vpp-merge-{stream}-ubuntu1404'
-            result: 'success'
         - gerrit:
             server-name: 'Primary'
             trigger-on:
@@ -692,6 +720,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - stream-parameter:
+            stream: '{stream}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -728,7 +758,7 @@
                 - include-raw-vpp-build.sh
         - shell:
             !include-raw-escape:
-                - include-raw-vpp-packagecloud-push.sh
+                - ../scripts/packagecloud_push.sh
 
     publishers:
         - archive:
@@ -739,4 +769,3 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-