From: Thanh Ha (zxiiro) <zxiiro@gmail.com>
Date: Fri, 2 Oct 2020 13:41:47 +0000 (+0000)
Subject: Merge "Fix ovsdb sonar configuration"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b54b4233f7a1709fa5b0ab7a0cb256f2cb1c822a;hp=aec52d31de4cd8390830c2d7d5ff6045b5eb27a8;p=releng%2Fbuilder.git

Merge "Fix ovsdb sonar configuration"
---

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 0f71cb4be..81bbf7047 100644
--- 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 38a833cc4..b2a1e7680 100644
--- 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