Change Sonar nonrtric-plt-sme to prescan script

The reason for the revert is that there is no code coverage reported
when using the gerrit-cli-sonar.

Issue-ID: NONRTRIC-812
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: I5269f90065e21438b64998a5b329894cc2441407

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index 06b0dd0..12d9c59 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -27,9 +27,6 @@
     # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
     java-version: openjdk11
     mvn-version: mvn36
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-name: '{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
 
 - project:
     <<: *nonrtric_plt_sme_common
@@ -61,11 +58,16 @@
 - project:
     <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore-sonar
+    # prescan script requires ubuntu
+    # golang is only on docker-enabled nodes
+    build-node: ubuntu1804-docker-4c-4g
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'capifcore/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    sonarcloud: true
+    sonar-prescan-script: !include-raw-escape: prescan-capifcore-ubuntu.sh
     sonar-project-file: ""
+    java-version: openjdk11
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
-      - gerrit-cli-sonar
+      - gerrit-sonar-prescan-script

diff --git a/jjb/nonrtric-plt-sme/sonar-project.properties b/jjb/nonrtric-plt-sme/sonar-project.properties
index 7972aa1..9067829 100644 (file)
--- a/jjb/nonrtric-plt-sme/sonar-project.properties
+++ b/jjb/nonrtric-plt-sme/sonar-project.properties
@@ -13,4 +13,4 @@ sonar.go.coverage.reportPaths=capifcore/coverage.txt
 # Inclusions
 sonar.inclusions=capifcore/main.go,capifcore/internal/**/**.go
 # Exclusions
-sonar.exclusions=capifcore/main_test.go,capifcore/internal/,capifcore/internal/**/*_test.go,capifcore/internal/**/*.gen.go,capifcore/internal/**/mocks/**
+sonar.exclusions=capifcore/main_test.go,capifcore/internal/**/*_test.go,capifcore/internal/**/*.gen.go,capifcore/internal/**/mocks/**