X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fhoneycomb.yaml;h=73aca1ef01b8bdacd39010afd0b72c8cd84c819b;hb=64a07c6bdc040b965965e983c2be6dadb46fef11;hp=0794125822bfd41757a148f73355c5114e50302e;hpb=90cc8684e4a7011041277ec88ffd0e200f2e50db;p=ci-management.git

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 079412582..73aca1ef0 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -4,32 +4,38 @@
     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:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1804':
-          branch: 'stable/1804'
-          repo-stream-part: 'stable.1804'
-      - '1807':
-          branch: 'stable/1807'
-          repo-stream-part: 'stable.1807'
       - '1810':
           branch: 'stable/1810'
           repo-stream-part: 'stable.1810'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
+
+- project:
+    name: honeycomb-view
+    views:
+      - project-view
+    project-name: honeycomb
 
 - job-template:
     name: 'honeycomb-verify-{stream}-{os}'
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -63,7 +69,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
@@ -77,12 +83,12 @@
       - email-notification:
           email-prefix: '[honeycomb]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'honeycomb-merge-{stream}-{os}'
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
 
     build-discarder:
@@ -97,9 +103,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -122,7 +128,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar site site:deploy'
@@ -134,7 +140,7 @@
 
     postbuilders:
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'honeycomb-settings'
           settings-type: cfp
@@ -159,13 +165,13 @@
           unique-version: true
           deploy-unstable: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'honeycomb-benchmark-master'
+    name: 'honeycomb-benchmark-master-{os}'
     project-type: maven
-    node: ubuntu1604-basebuild-4c-4g
-    jdk: openjdk8-ubuntu1604
+    node: '{os}-builder-4c-4g'
+    jdk: openjdk8-{os}
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -177,13 +183,13 @@
       - project-parameter:
           project: '{project}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
-          repo-name: 'master.ubuntu.xenial.main'
+          repo-name: 'master.{repo-os-part}'
 
     scm:
       - git-scm:
@@ -201,7 +207,7 @@
       - timed: '@daily'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Pbenchmark'
@@ -276,4 +282,13 @@
                 exclude: 'simple-container,list-in-container,complex-list-in-container'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
+
+- project:
+    name: honeycomb-info
+    project-name: honeycomb
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: honeycomb
+    branch: master