Merge pull request #1997 from nordic-institute/sonarconf-fix

chore: fix missing code coverage issue for SonarQube
nordic-institute · Mar 19, 2024 · 5b62b0b · 5b62b0b
2 parents 4240e94 + 607023a
commit 5b62b0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/build.gradle b/src/build.gradle
@@ -32,7 +32,7 @@ sonarqube {
         property "sonar.dependencyCheck.reportPath", "build/reports/owasp-dependency-check/dependency-check-report.xml"
         property "sonar.dependencyCheck.htmlReportPath", "build/reports/owasp-dependency-check/dependency-check-report.html"
         property "sonar.exclusions", "**/build/generated-sources/**"
-        property "sonar.coverage.jacoco.xmlReportPaths", "${rootProject.layout.buildDirectory.get().asFile}/reports/jacoco/jacocoAggregatedReport/jacocoAggregatedReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${rootProject.layout.buildDirectory.get().asFile}/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml"
 
         property "sonar.issue.ignore.multicriteria", "e1"
         //# ignore 'Local-Variable Type Inference should be used"
@@ -278,3 +278,4 @@ tasks.register("installGitHooks", Copy) {
     fileMode 0775
 }
 assemble.dependsOn installGitHooks
+tasks.sonar.dependsOn testCodeCoverageReport
diff --git a/src/gradle.properties b/src/gradle.properties
@@ -4,7 +4,7 @@ xroadVersion=7.5.0
 xroadBuildType=SNAPSHOT
 
 # SonarQube defaults
-sonarqubeHost=https://sonarqube.niis.org
+sonarqubeHost=https://sonarcloud.io
 sonarqubeProjectKey=xroad
 sonarqubeOrganization=
 # Dependency check