X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fric-plt-e2mgr%2Fric-plt-e2mgr.yaml;fp=jjb%2Fric-plt-e2mgr%2Fric-plt-e2mgr.yaml;h=9889b3c7830365bb5a4372f56daa3da1aec1ea55;hp=b78eb71345c2234f3a9f305b23318e4148a22daa;hb=3f5f89b3b9f227a82db37e770e051350dde7bb68;hpb=52096ec3f6a9ee9ce274209e72ba7183b3225f7e

diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
index b78eb713..9889b3c7 100644
--- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
+++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
@@ -5,46 +5,37 @@
     views:
       - project-view
 
+- project:
+    name: ric-plt-e2mgr-info
+    project: ric-plt/e2mgr
+    project-name: ric-plt-e2mgr
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - e2mgr_docker_common: &e2mgr_docker_common
-    # values apply to all RIC docker-build projects.
-    # factored out in case this needs multiple projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
+    # values apply to all E2MGR docker projects
     name: e2mgr-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-plt-e2mgr
     # git repo
     project: ric-plt/e2mgr
     # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
+    project-name: ric-plt-e2mgr
     # maven settings file has docker credentials
     mvn-settings: ric-plt-e2mgr-settings
+
+- project:
+    <<: *e2mgr_docker_common
+    name: ric-plt-e2mgr
+    # image name
+    docker-name: '{name}'
     # Dockerfile is in a subdir
     docker-root: E2Manager
+    # 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'
-    <<: *e2mgr_docker_common
-
-- project:
-    name: ric-plt-e2mgr-info
-    project: ric-plt/e2mgr
-    project-name: ric-plt-e2mgr
-    build-node: centos7-builder-1c-1g
-
-    jobs:
-      - gerrit-info-yaml-verify
+    stream:
+      - master:
+          branch: master