From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 19 Nov 2019 17:54:08 +0000 (+0000)
Subject: Merge "Prepare for docker image release for INT repos"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=69dc6c2c9ca4e77006cb3948bea0e320873b3cc1;hp=ce1967e911e74a05ea71fb9fbc5735c6e7dddaca;p=ci-management.git

Merge "Prepare for docker image release for INT repos"
---

diff --git a/global-jjb b/global-jjb
index 30a6dacd..794042ce 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 30a6dacd8befef0dc78942a53068fa52a101cc9f
+Subproject commit 794042ce858f009db24afb1b6d62bb2c33584c24
diff --git a/jjb/o-du-l2/o-du-l2.yaml b/jjb/o-du-l2/o-du-l2.yaml
new file mode 100644
index 00000000..949b3b6d
--- /dev/null
+++ b/jjb/o-du-l2/o-du-l2.yaml
@@ -0,0 +1,64 @@
+---
+- project:
+    name: o-du-l2-project-view
+    project-name: o-du-l2
+    views:
+      - project-view
+
+- project:
+    name: o-du-l2-info
+    project: o-du/l2
+    project-name: o-du-l2
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+
+- o_du_l2_common: &o_du_l2_common
+    # values apply to all o-du/l2 docker projects
+    name: o-du-l2-common
+    # git repo
+    project: o-du/l2
+    # jenkins job name prefix
+    project-name: o-du-l2
+    # maven settings file has docker credentials
+    mvn-settings: o-du-l2-settings
+    # source of docker tag
+    container-tag-method: yaml-file
+
+- project:
+    <<: *o_du_l2_common
+    name: o-du-l2
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    docker-build-args: '--network=host'
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *o_du_l2_common
+    name: o-du-l2-cu-stub
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    docker-build-args: '--network=host -f Dockerfile-cu-stub'
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *o_du_l2_common
+    name: o-du-l2-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
\ No newline at end of file
diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml
index bd521c58..cc95d209 100644
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -18,6 +18,8 @@
     name: sim-o1-interface-common
     # git repo
     project: sim/o1-interface
+    # jenkins job name prefix
+    project-name: sim-o1-interface
     # maven settings file has docker credentials
     mvn-settings: sim-o1-interface-settings
     # source of docker tag
@@ -29,7 +31,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     docker-root: ntsimulator
     # dockerfile is in subdir; needed because Dockerfile includes files outside of build context
     docker-build-args: '--network=host -f deploy/manager/Dockerfile'
@@ -54,7 +56,7 @@
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/{name}'
     docker-root: ntsimulator
     # dockerfile is in subdir; needed because Dockerfile includes files outside of build context
     docker-build-args: '--network=host -f deploy/Dockerfile'
@@ -68,3 +70,13 @@
     stream:
       - master:
           branch: master
+
+- project:
+    <<: *sim_o1_interface_common
+    name: sim-o1-interface-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'