Merge "Publish Honeycomb deb package"

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index a5cfcd3..cd8c798 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -23,6 +23,9 @@
         - '1606':
             branch: 'stable/1606'
             repo-stream-part: 'stable.1606'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
     type:
         - short
         - long
@@ -43,6 +46,10 @@
         - '1606':
             branch: 'stable/1606'
             repo-stream-part: 'stable.1606'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
+
     os: ubuntu1404
     type:
         - all
@@ -88,7 +95,9 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
 
 - job-template:
     name: 'vpp-verify-image-{stream}-{os}'
@@ -124,7 +133,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-images'
@@ -142,7 +151,9 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
 
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
@@ -186,17 +197,28 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
         - maven-target:
             maven-version: '{mvn33}'
             goals: '--version'
-            settings: '{vpp-settings}'
-            global-settings: '{global-settings}'
+            settings: 'vpp-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
         - provide-maven-settings:
-            settings-file: '{vpp-settings}'
-            global-settings-file: '{global-settings}'
+            settings-file: 'vpp-settings'
+            global-settings-file: 'global-settings'
         - shell:
-            !include-raw-escape include-raw-vpp-maven-push.sh
+            !include-raw-escape: include-raw-vpp-maven-push.sh
+    publishers:
+        - archive:
+            artifacts: 'build-root/*.rpm,build-root/*.deb'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
 
 - job-template:
     name: 'vpp-csit-verify-virl-{stream}'
@@ -226,6 +248,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - timestamps
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -237,9 +260,11 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: 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:
@@ -279,6 +304,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - timestamps
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -291,9 +317,9 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: 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: