Fix aggregated project reporting

This change was tried with yangtools, now fix all properly-configured
projects.

Change-Id: Ibf31981f95f74830739582fe6a594256b757b6e3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 83ef5a143073cf9a6cc80fcdf3f8618ffb5a7b68..e632895d3071b7e5e1ba786bcbe0733a8909534b 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -80,7 +80,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "aaa"
     project-name: "aaa"

diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml
index 5559a4f3e85f9cf3fc5fd36d938f905a09c18358..27268433548804a71ccc151a6e93944d341c425b 100644 (file)
--- a/jjb/alt-datastores/alt-datastores.yaml
+++ b/jjb/alt-datastores/alt-datastores.yaml
@@ -88,7 +88,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "alt-datastores"
     project-name: "alt-datastores"

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 6cdaf1ef9fbabd4dc62621585337a79793451c8b..169fa7f0e5eebdd20b88fe34717526629b3c24e1 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -71,7 +71,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "controller"
     project-name: "controller"

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 18fe76b5ac6338766953a87d05c1ae4eb561ffab..35b16134787a5d9bbff6855ac7cbd9450b20107b 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -147,8 +147,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "mdsal"
     project-name: "mdsal"

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 278f8f3d033005791173f88b69a56cf1d5972f47..1d58e13e55332a3284f4c044678c2943648912be 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -89,7 +89,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "netconf"
     project-name: "netconf"

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 83e3590128c2593b88426001f3b9a2f2e2c22445..362650d1abe30d0e53da9e0b1bf144eb0f575c79 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -152,7 +152,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "odlparent"
     project-name: "odlparent"