Reduce repeated key-value pairs
- Move common pairs like project, project-name to local
common macros
- Add values to defaults.yaml like container-push-registry
to avoid repetition in project templates
- Drop unused docker templates; the base image was
renamed to bldr-alpine3
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: Ia212df85acf4bbb5264e22ab9606a9125e47dc2d
diff --git a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
index f5ae0ea..f7a1790 100644
--- a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
+++ b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
@@ -6,15 +6,29 @@
- 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
- mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+ # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
java-version: openjdk11
- build-node: ubuntu1804-docker-4c-4g
+
+- project:
+ <<: *portal_ric_dashboard_common
+ name: portal-ric-dashboard-project
+ mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
jobs:
- gerrit-maven-docker-verify
- gerrit-maven-docker-merge
@@ -24,38 +38,22 @@
branch: master
- project:
+ <<: *portal_ric_dashboard_common
name: portal-ric-dashboard-clm
- project-name: portal-ric-dashboard
- project: portal/ric-dashboard
mvn-goals: test
- mvn-settings: portal-ric-dashboard-settings
- java-version: openjdk11
branch: master
- build-node: ubuntu1804-docker-4c-4g
nexus-iq-namespace: 'oran-'
jobs:
- gerrit-maven-clm
- project:
+ <<: *portal_ric_dashboard_common
name: portal-ric-dashboard-sonar
- project-name: portal-ric-dashboard
- project: portal/ric-dashboard
mvn-goals: test
- mvn-settings: portal-ric-dashboard-settings
- java-version: openjdk11
branch: master
- build-node: ubuntu1804-docker-4c-4g
sonarcloud: true
sonarcloud-project-key: o-ran-sc_portal-ric-dashboard
sonarcloud-project-organization: o-ran-sc
sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
jobs:
- gerrit-maven-sonar
-
-- 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