X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-app-admin%2Fric-app-admin.yaml;h=ceb494ac464a8b97c462db717e9fba4f41e48ad0;hb=3f5f89b3b9f227a82db37e770e051350dde7bb68;hp=df7394790c5b844c1a76eb2f92c282e3d5d94f14;hpb=52096ec3f6a9ee9ce274209e72ba7183b3225f7e;p=ci-management.git

diff --git a/jjb/ric-app-admin/ric-app-admin.yaml b/jjb/ric-app-admin/ric-app-admin.yaml
index df739479..ceb494ac 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
 
+- 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 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.
+    # values apply to all admin docker projects
     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}'
+    project-name: ric-app-admin
     # 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
-
+    <<: *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:
-      - gerrit-info-yaml-verify
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master