Switch to using {stream} for honeycomb

Change-Id: Id91f825463bad7d8f48bb2efe1c5ac300e06a45e
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 6e97e70..46b3338 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -1,16 +1,18 @@
 - project:
     name: honeycomb
     jobs:
-        - 'honeycomb-verify-{branch}-{os}'
-        - 'honeycomb-merge-{branch}-{os}'
-        - 'honeycomb-integration-{branch}-{os}'
-        - 'honeycomb-verify-image-{branch}-{os}'
+        - 'honeycomb-verify-{stream}-{os}'
+        - 'honeycomb-merge-{stream}-{os}'
+        - 'honeycomb-integration-{stream}-{os}'
+        - 'honeycomb-verify-image-{stream}-{os}'
     project: 'honeycomb'
-    branch: 'master'
+    stream:
+        - master:
+            branch: 'master'
     os: 'ubuntu1404'
 
 - job-template:
-    name: 'honeycomb-verify-{branch}-{os}'
+    name: 'honeycomb-verify-{stream}-{os}'
     project-type: maven
     node: verify
     concurrent: true
@@ -66,7 +68,7 @@
             email-prefix: '[honeycomb]'
 
 - job-template:
-    name: 'honeycomb-verify-image-{branch}-{os}'
+    name: 'honeycomb-verify-image-{stream}-{os}'
     project-type: maven
     node: 'verify-image-{os}'
     concurrent: true
@@ -135,7 +137,7 @@
             email-prefix: '[honeycomb]'
 
 - job-template:
-    name: 'honeycomb-merge-{branch}-{os}'
+    name: 'honeycomb-merge-{stream}-{os}'
     project-type: maven
     node: merge
     jdk: '{jdk}'
@@ -197,7 +199,7 @@
             deploy-unstable: false
 
 - job-template:
-    name: 'honeycomb-integration-{branch}-{os}'
+    name: 'honeycomb-integration-{stream}-{os}'
     project-type: maven
     node: merge
     jdk: '{jdk}'