summaryrefslogtreecommitdiffstats
path: root/jjb/honeycomb
diff options
context:
space:
mode:
authorC.J. Collier <cjcollier@linuxfoundation.org>2016-05-20 19:04:43 +0000
committerGerrit Code Review <gerrit@fd.io>2016-05-20 19:04:43 +0000
commitd695f8972c261b224bf410cd86a0537f54beac78 (patch)
tree60906d0df1179f06a54fe19958e1f789674af317 /jjb/honeycomb
parentc7247e95f101f5e3238304f34340e6545408f08b (diff)
parent4c78df34c511edf8ab5d2dd00ab6a13585af4649 (diff)
Merge "Switch to using {stream} for honeycomb"
Diffstat (limited to 'jjb/honeycomb')
-rw-r--r--jjb/honeycomb/honeycomb.yaml20
1 files changed, 11 insertions, 9 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 084f4c60a..cfa9ae4f4 100644
--- 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
@@ -68,7 +70,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
@@ -139,7 +141,7 @@
email-prefix: '[honeycomb]'
- job-template:
- name: 'honeycomb-merge-{branch}-{os}'
+ name: 'honeycomb-merge-{stream}-{os}'
project-type: maven
node: merge
jdk: '{jdk}'
@@ -203,7 +205,7 @@
deploy-unstable: false
- job-template:
- name: 'honeycomb-integration-{branch}-{os}'
+ name: 'honeycomb-integration-{stream}-{os}'
project-type: maven
node: merge
jdk: '{jdk}'