Merge "Fix honeycomb integration to trigger from current vpp merge job"

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 67e9d34..fafd916 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,16 +1,28 @@
 - project:
     name: vpp
     jobs:
-        - 'vpp-verify-{branch}-{os}'
-        - 'vpp-merge-{branch}-{os}'
-        - 'vpp-verify-image-{branch}-{os}'
+        - 'vpp-verify-{stream}-{os}'
+        - 'vpp-merge-{stream}-{os}'
+        - 'vpp-verify-image-{stream}-{os}'
 
     project: 'vpp'
     os:
-        - ubuntu1404
-        - centos7
-        - ubuntu1604
-    branch: 'master'
+        - ubuntu1404:
+            repo-os-part: 'ubuntu.trusty.main'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+        - centos7:
+            repo-os-part: 'centos7'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - test:
+            branch: 'stable/test'
+            repo-stream-part: 'stable.test'
+        - '1606':
+            branch: 'stable/1606'
+            repo-stream-part: 'stable.1606'
     type:
         - short
         - long
@@ -18,10 +30,19 @@
 - project:
     name: vpp-misc
     jobs:
-        - 'vpp-csit-verify-virl'
-        - 'vpp-csit-verify-perf-{type}'
+        - 'vpp-csit-verify-virl-{stream}'
+        - 'vpp-csit-verify-hw-perf-{stream}-{type}'
     project: 'vpp'
-    branch: 'master'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - test:
+            branch: 'stable/test'
+            repo-stream-part: 'stable.test'
+        - '1606':
+            branch: 'stable/1606'
+            repo-stream-part: 'stable.1606'
     os: ubuntu1404
     type:
         - all
@@ -29,7 +50,7 @@
         - long
 
 - job-template:
-    name: 'vpp-verify-{branch}-{os}'
+    name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -67,10 +88,10 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-build.sh
 
 - job-template:
-    name: 'vpp-verify-image-{branch}-{os}'
+    name: 'vpp-verify-image-{stream}-{os}'
 
     project-type: freestyle
     node: 'verify-image-{os}'
@@ -103,7 +124,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-images'
@@ -121,10 +142,10 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-build.sh
 
 - job-template:
-    name: 'vpp-merge-{branch}-{os}'
+    name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
     node: 'merge-{os}'
@@ -144,6 +165,8 @@
             os: '{os}'
         - maven-project-parameter:
             maven: '{mvn33}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -163,20 +186,22 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !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
 
 - job-template:
-    name: 'vpp-csit-verify-virl'
+    name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -214,9 +239,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-functional.sh
+            !include-raw-escape: include-raw-vpp-csit-functional.sh
 
     publishers:
         - archive-artifacts:
@@ -227,7 +252,7 @@
             output-path: 'csit'
 
 - job-template:
-    name: 'vpp-csit-verify-perf-{type}'
+    name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -268,9 +293,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: