X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-dbaas%2Fric-plt-dbaas.yaml;h=0fc854b14ed4ede8b75d5cdbca9ed6351a46bbfd;hb=3f5f89b3b9f227a82db37e770e051350dde7bb68;hp=4cd33909873bc64a90e5b709548b5a485d3e1106;hpb=52096ec3f6a9ee9ce274209e72ba7183b3225f7e;p=ci-management.git

diff --git a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
index 4cd33909..0fc854b1 100644
--- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
+++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
@@ -5,44 +5,35 @@
     views:
       - project-view
 
+- project:
+    name: ric-plt-dbaas-info
+    project: ric-plt/dbaas
+    project-name: ric-plt-dbaas
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - dbaas_docker_common: &dbaas_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 dbaas docker projects
     name: dbaas-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
-    # source of docker tag
-    container-tag-method: yaml-file
-    stream:
-      - master:
-          branch: master
-
-- project:
-    name: ric-plt-dbaas
     # git repo
     project: ric-plt/dbaas
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: ric-plt-dbaas
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-dbaas-settings
+
+- project:
+    <<: *dbaas_docker_common
+    name: ric-plt-dbaas
     # image name
     docker-name: '{name}'
     # Specify docker file and host network
     docker-build-args: '--network=host -f docker/Dockerfile.redis'
-    # maven settings file has docker credentials
-    mvn-settings: ric-plt-dbaas-settings
+    # source of docker tag
+    container-tag-method: yaml-file
     jobs:
       - '{project-name}-gerrit-docker-jobs'
-    <<: *dbaas_docker_common
-
-- project:
-    name: ric-plt-dbaas-info
-    project: ric-plt/dbaas
-    project-name: ric-plt-dbaas
-    build-node: centos7-builder-1c-1g
-
-    jobs:
-      - gerrit-info-yaml-verify
+    stream:
+      - master:
+          branch: master