Merge "CSIT-797 Add honeycomb parameter to hc2vpp-csit-verify job"

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

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 168fb13..59c81de 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -8,7 +8,6 @@
     os:
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
-            skip-site: 'true'
     stream:
         - master:
             branch: 'master'
@@ -16,6 +15,18 @@
         - '1609':
             branch: 'stable/1609'
             repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1701'
+        - '1704':
+            branch: 'stable/1704'
+            repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
+        - '1710':
+            branch: 'stable/1710'
+            repo-stream-part: 'stable.1710'
 
 - job-template:
     name: 'honeycomb-verify-{stream}-{os}'
@@ -53,9 +64,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'
@@ -117,7 +125,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
@@ -218,7 +226,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 +240,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 +254,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'