X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fportal-nonrtric-controlpanel%2Fportal-nonrtric-controlpanel.yaml;h=fbffa963c0b8bc4229ad6ae38154a520ad1d2af6;hb=refs%2Fheads%2Fmaster;hp=c5900a8b07e8d0817dced144bf22f618bd302dec;hpb=58d9fbdc830df96c118dee3f717779bcd4cfdb77;p=ci-management.git

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index c5900a8b..fbffa963 100644
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -5,16 +5,8 @@
     views:
       - project-view
 
-- project:
-    name: portal-nonrtric-controlpanel-info
-    project: portal/nonrtric-controlpanel
-    project-name: portal-nonrtric-controlpanel
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
-    # values apply to all projects here
+- _portal_nonrtric_controlpanel_common:
+    &portal_nonrtric_controlpanel_common # values apply to all projects here
     name: portal-nonrtric-controlpanel-common
     # git repo
     project: portal/nonrtric-controlpanel
@@ -23,37 +15,28 @@
     # 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
-
-- project:
-    <<: *portal_nonrtric_controlpanel_common
-    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
-    # do not trigger on changes in directory webapp-frontend/
-    gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!webapp-frontend\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - "{project-name}-gerrit-maven-docker-jobs"
-    stream:
-      - master:
-          branch: master
+    sonarcloud-project-key: "portal-nonrtric-controlpanel"
+    sonarcloud-project-organization: "o-ran-sc"
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: nonrtric-controlpanel-frontend
     # image name
-    docker-name: 'o-ran-sc/nonrtric-controlpanel'
+    docker-name: "o-ran-sc/nonrtric-controlpanel"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'webapp-frontend'
+    docker-root: "webapp-frontend"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'webapp-frontend/.*'
+        pattern: "webapp-frontend/.*"
+      - compare-type: REG_EXP
+        pattern: "docker-compose/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -61,6 +44,13 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -69,27 +59,29 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
-    name: portal-nonrtric-controlpanel-sonar
-    # template goal install builds docker image unnecessarily
-    mvn-params: -Ddocker.skip=true
+    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
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonar-project-file: ""
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-cli-sonar
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway
-    project-name: '{name}'
+    project-name: "{name}"
+    mvn-params: "-f nonrtric-gateway"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'nonrtric-gateway/.*'
+        pattern: "nonrtric-gateway/.*"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
@@ -99,15 +91,24 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway-docker
-    project-name: '{name}'
-    mvn-opts: '-Pdocker'
+    project-name: "{name}"
+    mvn-params: "-P docker -f nonrtric-gateway"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'nonrtric-gateway/.*'
+        pattern: "nonrtric-gateway/.*"
+      - compare-type: REG_EXP
+        pattern: "docker-compose/.*"
     build-node: ubuntu1804-docker-4c-4g
     jobs:
       - gerrit-maven-docker-verify
@@ -116,3 +117,10 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release