X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fhoneycomb.yaml;h=09ef2b2c0b80f8dd9e6335dab9e291c8b287c12b;hb=b7dcf868c2d994810b8f67745ed58e245b68f978;hp=d0883365a4037ac01b44ddc61e3b01a9114c3eac;hpb=118d7730534f4a97bff05335820ca0d635b3baa4;p=ci-management.git

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index d0883365a..09ef2b2c0 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -10,6 +10,9 @@
         - ubuntu1404:
             repo-os-part: 'ubuntu.trusty.main'
             skip-site: 'false'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+            skip-site: 'true'
         - centos7:
             repo-os-part: 'centos7'
             skip-site: 'true'
@@ -26,6 +29,7 @@
     project-type: maven
     node: verify-{os}
     concurrent: true
+    jdk: openjdk8-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -43,14 +47,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -63,7 +64,7 @@
         - 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'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -81,6 +82,7 @@
     project-type: maven
     node: 'verify-image-{os}'
     concurrent: true
+    jdk: openjdk8-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -98,14 +100,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -131,7 +130,7 @@
         - 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'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -162,20 +161,20 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -185,7 +184,7 @@
             branch: '{branch}'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -205,10 +204,76 @@
         - email-notification:
             email-prefix: '[honeycomb]'
 
+- job-template:
+    name: 'honeycomb-benchmark-master'
+    project-type: maven
+    node: verify-ubuntu1604
+    jdk: openjdk8-ubuntu1604
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - os-parameter:
+            os: 'ubuntu1604'
+        - maven-project-parameter:
+            maven: 'mvn33'
+        - repo-name-parameter:
+            repo-name: 'master.ubuntu.xenial.main'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - timed: '@daily'
+
+    maven:
+        maven-name: 'mvn33'
+        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'
+        settings: 'honeycomb-settings'
+        settings-type: cfp
+        global-settings: 'global-settings'
+        global-settings-type: cfp
+
+    publishers:
+        - plot:
+            - title: 'Infrastructure CFG write benchmark'
+              yaxis: 'ops/second'
+              csv-file-name: 'benchmark.csv'
+              group: 'infra-bench'
+              keep-records: true
+              numbuilds: '20'
+              style: 'line'
+              use-description: false
+              series:
+                - file: 'infra/it/benchmark/target/benchmark.csv'
+                  display-table: true
+                  format: 'csv'
+                  inclusion-flag: 'include-by-string'
+                  exclude: 'Score'
+
 - job-template:
     name: 'honeycomb-integration-{stream}-{os}'
     project-type: maven
     node: merge-{os}
+    jdk: openjdk8-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -222,20 +287,20 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -249,7 +314,7 @@
             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'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -260,7 +325,7 @@
 
     postbuilders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'honeycomb-settings'
             settings-type: cfp