X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-ranpm%2Fnonrtric-plt-ranpm.yaml;h=44df61ce4781e5098844ef0cbd49ee5b21502cbc;hb=5ee9050a86a8772fc1480bf54db7467513637b18;hp=ec1e4c62cc16791fcdeb95291482a2cf37297c14;hpb=c46bfa0b1a490006a53fde49610c8f909d1e1d4f;p=ci-management.git

diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
index ec1e4c62..44df61ce 100644
--- a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
+++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
@@ -5,15 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: nonrtric-plt-ranpm-info
-    project: nonrtric/plt/ranpm
-    project-name: nonrtric-plt-ranpm
-    build-node: centos7-builder-1c-1g
-    branch: master
-    jobs:
-      - gerrit-info-yaml-verify
-
 - _nonrtric-plt-ranpm_common: &nonrtric_plt_ranpm_jdk_common
     name: nonrtric-plt-ranpm-common
     # git repo
@@ -56,6 +47,8 @@
           branch: master
       - h-release:
           branch: h-release
+      - i-release:
+          branch: i-release
 
 # Jobs for nonrtric-plt-ranpm-pmproducer
 - project:
@@ -78,6 +71,8 @@
           branch: master
       - h-release:
           branch: h-release
+      - i-release:
+          branch: i-release
 
 # Jobs for nonrtric-plt-ranpm-influxlogger
 - project:
@@ -100,6 +95,8 @@
           branch: master
       - h-release:
           branch: h-release
+      - i-release:
+          branch: i-release
 
 - project:
     <<: *nonrtric_plt_ranpm_jdk_common
@@ -128,11 +125,14 @@
           branch: master
       - h-release:
           branch: h-release
+      - i-release:
+          branch: i-release
 
 # Jobs for nonrtric-plt-ranpm-pm-file-converter SONAR
 - project:
     <<: *nonrtric_plt_ranpm_jdk_common
     name: nonrtric-plt-ranpm-pm-file-converter-sonar
+    project-name: nonrtric-plt-ranpm-pm-file-converter
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
@@ -143,6 +143,64 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw-escape: sonar-project.properties
+    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
+      sonar.language=go
+      sonar.projectBaseDir=pm-file-converter
+      sonar.go.coverage.reportPaths=coverage.txt
+      sonar.inclusions=**/*.go
+      sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
+
+- project:
+    <<: *nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-datafilecollector-sonar
+    project-name: nonrtric-plt-ranpm-datafilecollector
+    # template goal install builds docker image unnecessarily
+    mvn-params: "-f datafilecollector -Ddocker.skip=true"
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "datafilecollector/.*"
+    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