X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-e2%2Fric-plt-e2.yaml;h=7d4af25d481949e82352452afd7640e2f0927b9c;hb=3f5f89b3b9f227a82db37e770e051350dde7bb68;hp=1d1285946c1694aa28d91cefb1a62e4d446129f6;hpb=52096ec3f6a9ee9ce274209e72ba7183b3225f7e;p=ci-management.git

diff --git a/jjb/ric-plt-e2/ric-plt-e2.yaml b/jjb/ric-plt-e2/ric-plt-e2.yaml
index 1d128594..7d4af25d 100644
--- a/jjb/ric-plt-e2/ric-plt-e2.yaml
+++ b/jjb/ric-plt-e2/ric-plt-e2.yaml
@@ -5,46 +5,37 @@
     views:
       - project-view
 
+- project:
+    name: ric-plt-e2-info
+    project: ric-plt/e2
+    project-name: ric-plt-e2
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - e2_docker_common: &e2_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 E2 docker projects
     name: e2-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-e2
     # git repo
     project: ric-plt/e2
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: ric-plt-e2
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-e2-settings
+
+- project:
+    <<: *e2_docker_common
+    name: ric-plt-e2
     # image name
     docker-name: '{name}'
     # subdirectory
     docker-root: RIC-E2-TERMINATION
-    # maven settings file has docker credentials
-    mvn-settings: ric-plt-e2-settings
+    # 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'
-    <<: *e2_docker_common
-
-- project:
-    name: ric-plt-e2-info
-    project: ric-plt/e2
-    project-name: ric-plt-e2
-    build-node: centos7-builder-1c-1g
-
-    jobs:
-      - gerrit-info-yaml-verify
+    stream:
+      - master:
+          branch: master