Drop branch parameter from release-job projects

[ci-management.git] / jjb / ric-app-mc / ric-app-mc.yaml

diff --git a/jjb/ric-app-mc/ric-app-mc.yaml b/jjb/ric-app-mc/ric-app-mc.yaml
index 96fe595..2243867 100644 (file)
--- a/jjb/ric-app-mc/ric-app-mc.yaml
+++ b/jjb/ric-app-mc/ric-app-mc.yaml
@@ -3,45 +3,74 @@
     name: ric-app-mc-project-view
     project-name: ric-app-mc
     views:
-      - project-view
+        - project-view
 
-- mc: &mc_docker_common
-    # values apply to all RIC docker-build projects.
-    # factored out in case ric-app-mc needs multiple projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
-    name: mc-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'
+- project:
+    name: ric-app-mc-info
+    project: ric-app/mc
+    project-name: ric-app-mc
+    build-node: centos7-builder-1c-1g
+    jobs:
+        - gerrit-info-yaml-verify
+
+- mc_common: &mc_common
+    # values apply to all MC projects
+    name: mc-common
+    # git repo
+    project: ric-app/mc
+    # maven settings file has docker credentials
+    mvn-settings: ric-app-mc-settings
+
+- project:
+    <<: *mc_common
+    name: ric-app-mc
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    docker-root: mc-core
     # source of docker tag
     container-tag-method: yaml-file
+    container-tag-yaml-dir: '{docker-root}'
+    # use host network
+    docker-build-args: '--network=host'
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '{docker-root}/.*'
+    jobs:
+        - '{project-name}-gerrit-docker-jobs'
     stream:
-      - master:
-          branch: master
+        - master:
+            branch: master
 
 - project:
-    name: ric-app-mc
-    # git repo
-    project: ric-app/mc
+    <<: *mc_common
+    name: ric-app-mc-listener
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
-    # maven settings file has docker credentials
-    mvn-settings: ric-app-mc-settings
+    docker-name: 'o-ran-sc/{name}'
+    docker-root: sidecars/listener
+    # source of docker tag
+    container-tag-method: yaml-file
+    container-tag-yaml-dir: '{docker-root}'
+    # use host network
+    docker-build-args: '--network=host'
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '{docker-root}/.*'
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    <<: *mc_docker_common
+        - '{project-name}-gerrit-docker-jobs'
+    stream:
+        - master:
+            branch: master
 
 - project:
-    name: ric-app-mc-info
-    project: ric-app/mc
+    <<: *mc_common
+    name: ric-app-mc-release
     project-name: ric-app-mc
-    build-node: centos7-builder-1c-1g
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
     jobs:
-      - gerrit-info-yaml-verify
+      - '{project-name}-gerrit-release-jobs'