X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fhoneycomb.yaml;h=553651ac63e30454564ea76146181dae5587788c;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=168fb132df41a365e2e232f0daa7763c0c76a405;hpb=6c39e638503b97484a51ccd0052a9cfe29e9fd85;p=ci-management.git

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 168fb132d..553651ac6 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: honeycomb
     jobs:
@@ -5,17 +6,22 @@
         - 'honeycomb-merge-{stream}-{os}'
         - 'honeycomb-benchmark-master'
     project: 'honeycomb'
-    os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
-            skip-site: 'true'
+    os: 'ubuntu1604'
+    repo-os-part: 'ubuntu.xenial.main'
+
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1609':
-            branch: 'stable/1609'
-            repo-stream-part: 'stable.1609'
+        - '1801':
+            branch: 'stable/1801'
+            repo-stream-part: 'stable.1801'
+        - '1804':
+            branch: 'stable/1804'
+            repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
 
 - job-template:
     name: 'honeycomb-verify-{stream}-{os}'
@@ -24,7 +30,7 @@
     concurrent: true
     jdk: openjdk8-{os}
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -53,9 +59,6 @@
             name: 'honeycomb'
             branch: '{branch}'
 
-    prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
@@ -78,7 +81,7 @@
     node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -117,7 +120,7 @@
     maven:
         maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar site site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'honeycomb-settings'
         settings-type: cfp
@@ -156,10 +159,10 @@
 - job-template:
     name: 'honeycomb-benchmark-master'
     project-type: maven
-    node: ubuntu1604-basebuild-4c-4g 
+    node: ubuntu1604-basebuild-4c-4g
     jdk: openjdk8-ubuntu1604
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -218,7 +221,6 @@
                   format: 'csv'
                   inclusion-flag: 'include-by-string'
                   exclude: 'persistence=true freq=1,persistence=true freq=10,persistence=false freq=1,persistence=false freq=10'
-        - plot:
             - title: 'Infrastructure CFG write benchmark (list-in-container)'
               yaxis: 'ops/second'
               csv-file-name: 'list-in-container.csv'
@@ -233,7 +235,6 @@
                   format: 'csv'
                   inclusion-flag: 'include-by-string'
                   exclude: 'persistence=true freq=1,persistence=true freq=10,persistence=false freq=1,persistence=false freq=10'
-        - plot:
             - title: 'Infrastructure CFG write benchmark (complex-list-in-container)'
               yaxis: 'ops/second'
               csv-file-name: 'complex-list-in-container.csv'
@@ -248,7 +249,6 @@
                   format: 'csv'
                   inclusion-flag: 'include-by-string'
                   exclude: 'persistence=true freq=1,persistence=true freq=10,persistence=false freq=1,persistence=false freq=10'
-        - plot:
             - title: 'Infrastructure CFG read benchmark'
               yaxis: 'ops/second'
               csv-file-name: 'operational-read.csv'