From f688e10b9896c7c9e800c7be5b054378bad05f54 Mon Sep 17 00:00:00 2001
From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 11 Jan 2022 07:53:52 -0800
Subject: [PATCH] Feat: Abstract sonar-properties to a file

To simplify the sonar implementation, a single
sonar-project.properties file can be used to store the necessary
information.

Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I8e2331dfe7239e2af29083a150747d01541c54f8
---
 jjb/nonrtric/nonrtric.yaml            | 21 ++-------------------
 jjb/nonrtric/sonar-project.properties | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 jjb/nonrtric/sonar-project.properties

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 415f4176..0124b6a1 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -219,7 +219,7 @@
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-dmaap-mediator-producer-sonar
-    project-name: nonrtric-dmaap-mediator-producer-sonar
+    project-name: nonrtric-dmaap-mediator-producer
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
@@ -227,23 +227,7 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_nonrtric-dmaap-mediator-producer
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=dmaap-mediator-producer/coverage.txt
-        # Inclusions
-        sonar.inclusions=dmaap-mediator-producer/internal/**/**.go
-        # Exclusions
-        sonar.exclusions=dmaap-mediator-producer/main.go,dmaap-mediator-producer/mocks/**.go,dmaap-mediator-producer/stub/**.go,dmaap-mediator-producer/internal/**/**_test.go
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -386,4 +370,3 @@
         sonar.exclusions=test/usecases/oruclosedlooprecovery/goversion/mocks/**.go,test/usecases/oruclosedlooprecovery/goversion/internal/**/**_test.go,test/usecases/oruclosedlooprecovery/goversion/**_test.go,test/usecases/oruclosedlooprecovery/goversion/simulator/**.go
     jobs:
       - gerrit-sonar-prescan-script
-
diff --git a/jjb/nonrtric/sonar-project.properties b/jjb/nonrtric/sonar-project.properties
new file mode 100644
index 00000000..4b499ffa
--- /dev/null
+++ b/jjb/nonrtric/sonar-project.properties
@@ -0,0 +1,16 @@
+# Required metadata
+sonar.login={sonarcloud_api_token}
+sonar.projectKey={sonarcloud_project_organization}_{project-name}
+sonar.organization={sonarcloud_project_organization}
+# Encoding
+sonar.build.sourceEncoding=UTF-8
+# Language
+sonar.language=go
+# Source
+sonar.sources=.
+# Unit tests
+sonar.go.coverage.reportPaths=dmaap-mediator-producer/coverage.txt
+# Inclusions
+sonar.inclusions=dmaap-mediator-producer/internal/**/**.go
+# Exclusions
+sonar.exclusions=dmaap-mediator-producer/main.go,dmaap-mediator-producer/mocks/**.go,dmaap-mediator-producer/stub/**.go,dmaap-mediator-producer/internal/**/**_test.go
-- 
2.16.6