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

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 9662b5b01..553651ac6 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: honeycomb
     jobs:
@@ -5,26 +6,31 @@
         - '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}'
     project-type: maven
-    node: verify-{os}
+    node: '{os}-basebuild-4c-4g'
     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,11 +59,8 @@
             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'
+        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 site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -69,14 +72,16 @@
     publishers:
         - email-notification:
             email-prefix: '[honeycomb]'
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'honeycomb-merge-{stream}-{os}'
     project-type: maven
-    node: merge-{os}
+    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}'
@@ -88,7 +93,9 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: 'mvn33'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -111,9 +118,9 @@
             branch: '{branch}'
 
     maven:
-        maven-name: 'mvn33'
+        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
@@ -122,7 +129,7 @@
 
     postbuilders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'honeycomb-settings'
             settings-type: cfp
@@ -146,14 +153,16 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'honeycomb-benchmark-master'
     project-type: maven
-    node: verify-ubuntu1604
+    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}'
@@ -165,7 +174,9 @@
         - os-parameter:
             os: 'ubuntu1604'
         - maven-project-parameter:
-            maven: 'mvn33'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: 'master.ubuntu.xenial.main'
 
@@ -185,7 +196,7 @@
         - timed: '@daily'
 
     maven:
-        maven-name: 'mvn33'
+        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 -Pbenchmark'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -196,17 +207,61 @@
 
     publishers:
         - plot:
-            - title: 'Infrastructure CFG write benchmark'
+            - title: 'Infrastructure CFG write benchmark (simple-container)'
+              yaxis: 'ops/second'
+              csv-file-name: 'simple-container.csv'
+              group: 'infra-bench'
+              keep-records: true
+              numbuilds: '20'
+              style: 'line'
+              use-description: false
+              series:
+                - file: 'infra/it/benchmark/target/simple-container.csv'
+                  display-table: true
+                  format: 'csv'
+                  inclusion-flag: 'include-by-string'
+                  exclude: 'persistence=true freq=1,persistence=true freq=10,persistence=false freq=1,persistence=false freq=10'
+            - title: 'Infrastructure CFG write benchmark (list-in-container)'
+              yaxis: 'ops/second'
+              csv-file-name: 'list-in-container.csv'
+              group: 'infra-bench'
+              keep-records: true
+              numbuilds: '20'
+              style: 'line'
+              use-description: false
+              series:
+                - file: 'infra/it/benchmark/target/list-in-container.csv'
+                  display-table: true
+                  format: 'csv'
+                  inclusion-flag: 'include-by-string'
+                  exclude: 'persistence=true freq=1,persistence=true freq=10,persistence=false freq=1,persistence=false freq=10'
+            - title: 'Infrastructure CFG write benchmark (complex-list-in-container)'
+              yaxis: 'ops/second'
+              csv-file-name: 'complex-list-in-container.csv'
+              group: 'infra-bench'
+              keep-records: true
+              numbuilds: '20'
+              style: 'line'
+              use-description: false
+              series:
+                - file: 'infra/it/benchmark/target/complex-list-in-container.csv'
+                  display-table: true
+                  format: 'csv'
+                  inclusion-flag: 'include-by-string'
+                  exclude: 'persistence=true freq=1,persistence=true freq=10,persistence=false freq=1,persistence=false freq=10'
+            - title: 'Infrastructure CFG read benchmark'
               yaxis: 'ops/second'
-              csv-file-name: 'benchmark.csv'
+              csv-file-name: 'operational-read.csv'
               group: 'infra-bench'
               keep-records: true
               numbuilds: '20'
               style: 'line'
               use-description: false
               series:
-                - file: 'infra/it/benchmark/target/benchmark.csv'
+                - file: 'infra/it/benchmark/target/operational-read.csv'
                   display-table: true
                   format: 'csv'
                   inclusion-flag: 'include-by-string'
-                  exclude: 'Score, Score Error (99,9%)'
+                  exclude: 'simple-container,list-in-container,complex-list-in-container'
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'