Merge "Fix ovsdb sonar configuration"

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 0f71cb4bedc372e8a196ef9440953845633f8fcf..81bbf70478ea96a3474996dd1835986dae1de66c 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -101,8 +101,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -P!karaf
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "bgpcep"
     project-name: "bgpcep"

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index 38a833cc477e31fba67c70fe683bef4c1108c7dd..b2a1e76800bf32539c1ce611f7175c5950a92cea 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -56,6 +56,7 @@
     project: "odlmicro"
     project-name: "odlmicro"
     branch: "master"
+    java-version: "openjdk11"
     mvn-settings: "odlmicro-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true