Merge "CSIT-474: CSIT documentation auto generation"

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

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 509cc5b..9662b5b 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -59,7 +59,7 @@
     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 -Dkaraf.keep.unpack=true site'
+        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'
         settings: 'honeycomb-settings'
         settings-type: cfp
@@ -113,7 +113,7 @@
     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 -Dkaraf.keep.unpack=true -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 -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'honeycomb-settings'
         settings-type: cfp
@@ -170,10 +170,9 @@
             repo-name: 'master.ubuntu.xenial.main'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
+            branch: 'master'
 
     wrappers:
         - ssh-agent-credentials:
@@ -210,4 +209,4 @@
                   display-table: true
                   format: 'csv'
                   inclusion-flag: 'include-by-string'
-                  exclude: 'Score'
+                  exclude: 'Score, Score Error (99,9%)'