adding projectBaseDir in sonar properties for pm-file-converter

[ci-management.git] / jjb / nonrtric-plt-ranpm / nonrtric-plt-ranpm.yaml

diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
index 46a3a9f..e156969 100644 (file)
--- a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
+++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
@@ -151,10 +151,10 @@
       sonar.projectName={project-name}
       sonar.build.sourceEncoding=UTF-8
       sonar.language=go
-      sonar.sources=.
-      sonar.go.coverage.reportPaths=pm-file-converter/coverage.txt
-      sonar.inclusions=pm-file-converter/main.go,pm-file-converter/common/**/**.go,pm-file-converter/components/**/**.go
-      sonar.exclusions=pm-file-converter/components/xmltransform/xmltransform_test.go
+      sonar.projectBaseDir=pm-file-converter
+      sonar.go.coverage.reportPaths=coverage.txt
+      sonar.inclusions=**/*.go
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -167,11 +167,41 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: "datafilecollector/.*"
-    sonar-properties: |
-      sonar.login={sonarcloud_api_token}
-      sonar.projectKey={sonarcloud_project_organization}_{project-name}
-      sonar.organization={sonarcloud_project_organization}
-      sonar.projectName={project-name}
-      sonar.build.sourceEncoding=UTF-8
+    sonarcloud: true
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric-plt-ranpm-datafilecollector"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    jobs:
+      - gerrit-maven-sonar
+
+- project:
+    <<: *nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-pmproducer-sonar
+    project-name: nonrtric-plt-ranpm-pmproducer
+    # template goal install builds docker image unnecessarily
+    mvn-params: "-f pmproducer -Ddocker.skip=true"
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "pmproducer/.*"
+    sonarcloud: true
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric-plt-ranpm-pmproducer"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    jobs:
+      - gerrit-maven-sonar
+
+- project:
+    <<: *nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-influxlogger-sonar
+    project-name: nonrtric-plt-ranpm-influxlogger
+    # template goal install builds docker image unnecessarily
+    mvn-params: "-f influxlogger -Ddocker.skip=true"
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "influxlogger/.*"
+    sonarcloud: true
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric-plt-ranpm-influxlogger"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar