summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2019-02-21 16:51:18 +0000
committerGerrit Code Review <gerrit@fd.io>2019-02-21 16:51:18 +0000
commitecc0bffb218af219fb8463e87270fdd1b3959628 (patch)
treead1cf59d26ed0d764790f36a16e22d062dbd3581
parentf94c60e68cc0bc6e644ad471f81689b177fae614 (diff)
parent8a6e87a16be588fa18a353628dcb394741e985b7 (diff)
Merge "HONEYCOMB-450: update honeycomb jobs to bionic"
-rw-r--r--jjb/honeycomb/honeycomb.yaml19
1 files changed, 11 insertions, 8 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 0e715c70d..2ee68a2f9 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -4,10 +4,13 @@
jobs:
- 'honeycomb-verify-{stream}-{os}'
- 'honeycomb-merge-{stream}-{os}'
- - 'honeycomb-benchmark-master'
+ - 'honeycomb-benchmark-master-{os}'
project: 'honeycomb'
- os: 'ubuntu1604'
- repo-os-part: 'ubuntu.xenial.main'
+ os:
+ - ubuntu1804:
+ repo-os-part: 'ubuntu.bionic.main'
+ - ubuntu1604:
+ repo-os-part: 'ubuntu.xenial.main'
stream:
- master:
@@ -165,10 +168,10 @@
maven-version: 'mvn33-new'
- job-template:
- name: 'honeycomb-benchmark-master'
+ name: 'honeycomb-benchmark-master-{os}'
project-type: maven
- node: ubuntu1604-basebuild-4c-4g
- jdk: openjdk8-ubuntu1604
+ node: '{os}-basebuild-4c-4g'
+ jdk: openjdk8-{os}
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -180,13 +183,13 @@
- project-parameter:
project: '{project}'
- os-parameter:
- os: 'ubuntu1604'
+ os: '{os}'
- maven-project-parameter:
maven: 'mvn33-new'
- maven-exec:
maven-version: 'mvn33-new'
- repo-name-parameter:
- repo-name: 'master.ubuntu.xenial.main'
+ repo-name: 'master.{repo-os-part}'
scm:
- git-scm: