X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fportal-ric-dashboard%2Fportal-ric-dashboard.yaml;h=f7a1790d696e453b0eb4628add2fb04a087f156c;hb=57a1f05cffa1e080a3a7f84d1eec00eae44cc575;hp=5b962cf0707c05851e3ef4a226299348a142ce3d;hpb=b8e5823b6132862ab820b8e69255c728d1e81b43;p=ci-management.git

diff --git a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
index 5b962cf0..f7a1790d 100644
--- a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
+++ b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
@@ -6,44 +6,54 @@
       - project-view
 
 - project:
-    name: portal-ric-dashboard-project
-    # jenkins job name prefix
+    name: portal-ric-dashboard-info
+    project: portal/ric-dashboard
     project-name: portal-ric-dashboard
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- portal_ric_dashboard_common: &portal_ric_dashboard_common
+    # values apply to all projects here
+    name: portal-ric-dashboard-common
     # git repo
     project: portal/ric-dashboard
+    # jenkins job name prefix
+    project-name: portal-ric-dashboard
+    # maven settings file has docker credentials
     mvn-settings: portal-ric-dashboard-settings
+    # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
+    java-version: openjdk11
+
+- project:
+    <<: *portal_ric_dashboard_common
+    name: portal-ric-dashboard-project
     mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
-    nexus-iq-namespace: 'oran-'
-    build-node: ubuntu1804-docker-4c-4g
     jobs:
       - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
-      # - gerrit-maven-clm
     stream:
       - master:
           branch: master
 
 - project:
-    name: portal-ric-dashboard-sonar
-    project-name: portal-ric-dashboard
-    project: portal/ric-dashboard
-    mvn-settings: portal-ric-dashboard-settings
+    <<: *portal_ric_dashboard_common
+    name: portal-ric-dashboard-clm
+    mvn-goals: test
     branch: master
-    build-node: ubuntu1804-docker-4c-4g
+    nexus-iq-namespace: 'oran-'
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-clm
 
+- project:
+    <<: *portal_ric_dashboard_common
+    name: portal-ric-dashboard-sonar
+    mvn-goals: test
+    branch: master
     sonarcloud: true
     sonarcloud-project-key: o-ran-sc_portal-ric-dashboard
     sonarcloud-project-organization: o-ran-sc
     sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
-
-- project:
-    name: portal-ric-dashboard-info
-    project: portal/ric-dashboard
-    project-name: portal-ric-dashboard
-    build-node: centos7-builder-1c-1g
-
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-maven-sonar