Merge "Modify logs publisher"

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

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index b495f17..f85eafd 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -4,27 +4,27 @@
     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
@@ -35,7 +35,7 @@
 - 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}
 
@@ -69,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'
@@ -82,13 +82,12 @@
     publishers:
       - email-notification:
           email-prefix: '[honeycomb]'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - 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:
@@ -103,9 +102,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}'
 
@@ -128,7 +127,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'
@@ -140,7 +139,7 @@
 
     postbuilders:
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'honeycomb-settings'
           settings-type: cfp
@@ -164,14 +163,13 @@
           id: ''
           unique-version: true
           deploy-unstable: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - 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}'
@@ -183,13 +181,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:
@@ -207,7 +205,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'
@@ -281,5 +279,13 @@
                 # yamllint disable-line rule:line-length
                 exclude: 'simple-container,list-in-container,complex-list-in-container'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
+
+- project:
+    name: honeycomb-info
+    project-name: honeycomb
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: honeycomb
+    branch: master