Refactor!: Update JJB code to comply with 5.x

[ci-management.git] / jjb / portal-nonrtric-controlpanel / portal-nonrtric-controlpanel.yaml

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index f19d1f3..0181138 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
+- _portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
     # values apply to all projects here
     name: portal-nonrtric-controlpanel-common
     # git repo
@@ -23,8 +23,10 @@
     # maven settings file has docker credentials
     mvn-settings: portal-nonrtric-controlpanel-settings
     # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: mvn36
+    sonarcloud-project-key: "portal-nonrtric-controlpanel"
+    sonarcloud-project-organization: "o-ran-sc"
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -50,10 +52,9 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -66,16 +67,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
@@ -93,10 +110,9 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -116,8 +132,6 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
-
+      - g-release:
+          java-version: openjdk11
+          branch: g-release