X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcom-log%2Fcom-log.yaml;h=7fac3c78295047606ee66224303b39195d7f9576;hb=3f5f89b3b9f227a82db37e770e051350dde7bb68;hp=5465a473e552918d5fe00ab2ec7d654dc36ac679;hpb=2cd087b58f0f5524b794eda8f4d5290cacb22ed1;p=ci-management.git

diff --git a/jjb/com-log/com-log.yaml b/jjb/com-log/com-log.yaml
index 5465a473..7fac3c78 100644
--- a/jjb/com-log/com-log.yaml
+++ b/jjb/com-log/com-log.yaml
@@ -5,47 +5,36 @@
     views:
       - project-view
 
+- project:
+    name: com-log-info
+    project: com/log
+    project-name: com-log
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - log_docker_common: &log_docker_common
-    # values apply to all RIC docker-build projects.
-    # factored out in case log needs multiple projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
+    # values apply to all com/log docker projects
     name: log-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: com-log
     # git repo
     project: com/log
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: com-log
+    # maven settings file has docker credentials
+    mvn-settings: com-log-settings
+
+- project:
+    <<: *log_docker_common
+    name: com-log
     # 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
-    # maven settings file has docker credentials
-    mvn-settings: com-log-settings
-    # copy packages to Jenkins filesystem
-    post_docker_build_script: !include-raw-escape:
-      - ../shell/export-packages.sh
     jobs:
-      # TODO: define a merge template to push package, not image
       - gerrit-docker-verify
-    <<: *log_docker_common
-
-- project:
-    name: com-log-info
-    project: com/log
-    project-name: com-log
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
+      - oran-gerrit-docker-ci-pc-merge
+    stream:
+      - master:
+          branch: master