X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fric-plt-lib-rmr%2Fric-plt-lib-rmr.yaml;h=bfaedcc665cd419f5633cad4061932508b778a57;hb=09efce9352bc23cdf703f3f9dcdfd6b9e455b24e;hp=b5378a118eb0e3b98282760be80cc5e095edf72b;hpb=a2f7362e594dee76a15d7091a47e6933802bdf47;p=ci-management.git

diff --git a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
index b5378a11..bfaedcc6 100644
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -5,45 +5,36 @@
     views:
       - project-view
 
+- project:
+    name: ric-plt-lib-rmr-info
+    project: ric-plt/lib/rmr
+    project-name: ric-plt-lib-rmr
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - rmr_docker_common: &rmr_docker_common
-    # values apply to all RIC docker-build projects.
-    # factored out in case rmr needs multiple projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
+    # values apply to all RMR docker projects
     name: rmr-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
-    stream:
-      - master:
-          branch: master
-
-- project:
-    name: ric-plt-lib-rmr
     # git repo
     project: ric-plt/lib/rmr
     # jenkins job name prefix
-    project-name: '{name}'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host -f ci/Dockerfile'
-    # image name
-    docker-name: '{name}'
-    # image tag, use a fixed value
-    container-tag-method: latest
+    project-name: ric-plt-lib-rmr
     # maven settings file has docker credentials
     mvn-settings: ric-plt-lib-rmr-settings
-    jobs:
-      # verify only; no merge bcos no image is pushed
-      - gerrit-docker-verify
-    <<: *rmr_docker_common
 
 - project:
-    name: ric-plt-lib-rmr-info
-    project: ric-plt/lib/rmr
-    project-name: ric-plt-lib-rmr
-    build-node: centos7-builder-1c-1g
-
+    <<: *rmr_docker_common
+    name: ric-plt-lib-rmr
+    # image name
+    docker-name: '{name}'
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host -f ci/Dockerfile'
+    # image tag; use a fixed value
+    container-tag-method: latest
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-docker-verify
+      - oran-gerrit-docker-ci-pc-merge
+    stream:
+      - master:
+          branch: master