From: John  Keeney <john.keeney@est.tech>
Date: Tue, 4 Oct 2022 12:29:31 +0000 (+0000)
Subject: Merge "Fix Sonar for nonrtric-controlpanel"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=11bd95a78bae042fec709463da262ac382c58fe5;hp=039ad8c548abd6eef1b796259e8ab459f2ecdb5f;p=ci-management.git

Merge "Fix Sonar for nonrtric-controlpanel"
---

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index f19d1f3f..1c9b831c 100644
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -25,6 +25,8 @@
     # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
     java-version: openjdk11
     mvn-version: mvn36
+    sonarcloud-project-key: "portal-nonrtric-controlpanel"
+    sonarcloud-project-organization: "o-ran-sc"
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -66,16 +68,32 @@
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
-    name: portal-nonrtric-controlpanel-sonar
+    name: portal-nonrtric-controlpanel-gateway-sonar
     # template goal install builds docker image unnecessarily
-    mvn-params: -Ddocker.skip=true
+    mvn-params: '-Ddocker.skip=true -f nonrtric-gateway'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'nonrtric-gateway/.*'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-key: '{project-name}-gateway'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-maven-sonar
 
+- project:
+    <<: *portal_nonrtric_controlpanel_common
+    name: portal-nonrtric-controlpanel-frontend-sonar
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'webapp-frontend/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    java-version: openjdk11
+    sonarcloud: true
+    sonar-project-file: ""
+    jobs:
+      - gerrit-cli-sonar
+
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway