X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcom-log%2Fcom-log.yaml;h=0c8d3394834ae533ca76415c25a2b5d798deac5c;hb=bcbf5ec9028d27d98bc65dbabb681ff6e2ec6704;hp=5fdebbbaf228f189cfbdbc6d730510aa21d61ded;hpb=d73e8e317df2c5d50da08791e7ee7da26db88f9a;p=ci-management.git

diff --git a/jjb/com-log/com-log.yaml b/jjb/com-log/com-log.yaml
index 5fdebbba..0c8d3394 100644
--- a/jjb/com-log/com-log.yaml
+++ b/jjb/com-log/com-log.yaml
@@ -5,45 +5,38 @@
     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
     jobs:
-      # verify only; no merge bcos no image is pushed
       - 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:
+          # stage every Saturday
+          cron: 'H H * * 6'
+    stream:
+      - master:
+          branch: master