feat: leave default SonarQube properties intact, allow overriding via

command-line arguments for GitHub actions
nordic-institute · Aug 28, 2023 · 2c23f39 · 2c23f39
1 parent 9f0a4b8
commit 2c23f39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
@@ -45,7 +45,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         working-directory: ./src
-        run: ./gradlew -Dorg.gradle.jvmargs=-Xmx6g -PxroadBuildType=RELEASE --stacktrace build sonar test intTest runProxyTest runMetaserviceTest runProxymonitorMetaserviceTest jacocoTestReport dependencyCheckAggregate -Pfrontend-npm-audit
+        run: ./gradlew -Dorg.gradle.jvmargs=-Xmx6g -PsonarqubeHost=https://sonarcloud.io -PsonarqubeProjectKey=nordic-institute_X-Road -PsonarqubeOrganization=nordic-institute -PxroadBuildType=RELEASE --stacktrace build sonar test intTest runProxyTest runMetaserviceTest runProxymonitorMetaserviceTest jacocoTestReport dependencyCheckAggregate -Pfrontend-npm-audit
       - name: Test report
         env:
           NODE_OPTIONS: '--max-old-space-size=6144'

diff --git a/src/build.gradle b/src/build.gradle
@@ -26,9 +26,9 @@ repositories {
 
 sonarqube {
     properties {
-        property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.projectKey", "nordic-institute_X-Road"
-        property "sonar.organization", "nordic-institute"
+        property "sonar.host.url", "${sonarqubeHost}"
+        property "sonar.projectKey", "${sonarqubeProjectKey}"
+        property "sonar.organization", "${sonarqubeOrganization}"
         property "sonar.projectName", "X-Road"
         property "sonar.projectDescription", "Data Exchange Layer"
         property "sonar.projectVersion", xroadVersion

diff --git a/src/gradle.properties b/src/gradle.properties
@@ -3,6 +3,11 @@ org.gradle.jvmargs=-Xmx1024m
 xroadVersion=7.4.0
 xroadBuildType=SNAPSHOT
 
+# SonarQube defaults
+sonarqubeHost=https://sonarqube.niis.org
+sonarqubeProjectKey=xroad
+sonarqubeOrganization=
+
 # common dependency versions
 akkaVersion=2.13:2.6.20
 scalaLibraryVersion=2.13.10