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/ric-app-admin/ric-app-admin.yaml b/jjb/ric-app-admin/ric-app-admin.yaml
index df73947..ceb494a 100644
--- a/jjb/ric-app-admin/ric-app-admin.yaml
+++ b/jjb/ric-app-admin/ric-app-admin.yaml
@@ -5,44 +5,35 @@
views:
- project-view
-- admin_docker_common: &admin_docker_common
- # values apply to all RIC docker-build projects.
- # factored out in case ric-app-admin needs multiple projects.
- # use a specific name to prevent reuse attempts
- # bcos anchors don't cross document boundaries.
- name: admin-docker-common
- build-node: ubuntu1804-docker-4c-4g
- # pull from the public mirror + releases registry
- container-public-registry: nexus3.o-ran-sc.org:10001
- # push to the staging repo bcos all builds are RCs
- container-push-registry: nexus3.o-ran-sc.org:10004
- # use host network to clone from our gerrit
- docker-build-args: '--network=host'
- # source of docker tag
- container-tag-method: yaml-file
- stream:
- - master:
- branch: master
-
-- project:
- name: ric-app-admin
- # git repo
- project: ric-app/admin
- # jenkins job name prefix
- project-name: '{name}'
- # image name
- docker-name: '{name}'
- # maven settings file has docker credentials
- mvn-settings: ric-app-admin-settings
- jobs:
- - '{project-name}-gerrit-docker-jobs'
- <<: *admin_docker_common
-
- project:
name: ric-app-admin-info
project: ric-app/admin
project-name: ric-app-admin
build-node: centos7-builder-1c-1g
-
jobs:
- gerrit-info-yaml-verify
+
+- admin_docker_common: &admin_docker_common
+ # values apply to all admin docker projects
+ name: admin-docker-common
+ # git repo
+ project: ric-app/admin
+ # jenkins job name prefix
+ project-name: ric-app-admin
+ # maven settings file has docker credentials
+ mvn-settings: ric-app-admin-settings
+
+- project:
+ <<: *admin_docker_common
+ name: ric-app-admin
+ # image name
+ docker-name: '{name}'
+ # source of docker tag
+ container-tag-method: yaml-file
+ # use host network to clone from our gerrit
+ docker-build-args: '--network=host'
+ jobs:
+ - '{project-name}-gerrit-docker-jobs'
+ stream:
+ - master:
+ branch: master