From: Jessica Wagantall Date: Tue, 19 Nov 2019 18:14:51 +0000 (+0000) Subject: Merge "Prepare for docker image release for all RICP repos" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=92514b9bd66d248deec910af64feafd641eb3a58;hp=5bf12754bc361f2a4ae941f1a97c2c7ff0447936;p=ci-management.git Merge "Prepare for docker image release for all RICP 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/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml index 6cc505d0..bc806444 100644 --- a/jjb/it-dep/it-dep.yaml +++ b/jjb/it-dep/it-dep.yaml @@ -18,6 +18,8 @@ name: it-dep-docker-common # git repo project: it/dep + # jenkins job name prefix + project-name: it-dep # maven settings file has docker credentials mvn-settings: it-dep-settings # use host network to clone from our gerrit @@ -36,7 +38,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # dockerfile is in subdir docker-build-args: -f ci/Dockerfile # any tag will do @@ -53,7 +55,7 @@ # image is not pushed, use trivial tag container-tag-method: latest # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # use host network for network resources docker-build-args: '--network=host -f ci/Dockerfile-package' jobs: @@ -69,7 +71,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # root of docker build docker-root: ric-infra/45-Tiller/docker # build only on relevant changes @@ -85,11 +87,22 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # root of docker build docker-root: ric-common/Initcontainer/docker gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: '{docker-root}/.*' jobs: - - '{project-name}-gerrit-docker-jobs' \ No newline at end of file + - '{project-name}-gerrit-docker-jobs' + +- project: + <<: *it_dep_common + name: it-dep-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' + diff --git a/jjb/it-otf/it-otf.yaml b/jjb/it-otf/it-otf.yaml index e228a6b9..3c253226 100644 --- a/jjb/it-otf/it-otf.yaml +++ b/jjb/it-otf/it-otf.yaml @@ -1,19 +1,4 @@ --- -# Copyright (c) 2019 AT&T Intellectual Property. -# Copyright (c) 2019 Nokia. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - project: name: it-otf-project-view project-name: it-otf @@ -33,6 +18,8 @@ name: it-otf-docker-common # git repo project: it/otf + # jenkins job name prefix + project-name: it-otf # source of docker tag container-tag-method: yaml-file # maven settings file has docker credentials @@ -49,7 +36,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: oran-ric-test-head # dockerfile is in subdir of docker root @@ -67,7 +54,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-frontend # dockerfile is in subdir of docker root @@ -85,7 +72,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-ping-test-head # dockerfile is in subdir of docker root @@ -103,7 +90,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-robot-test-head # dockerfile is in subdir of docker root @@ -121,7 +108,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-ssh-test-head # dockerfile is in subdir of docker root @@ -139,7 +126,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-camunda # dockerfile is in subdir of docker root @@ -157,7 +144,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-service-api # dockerfile is in subdir of docker root @@ -168,3 +155,13 @@ gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: '{docker-root}/.*' + +- project: + <<: *it_otf_common + name: it-otf-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' diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml index c6981c1a..f45b7778 100644 --- a/jjb/it-test/it-test.yaml +++ b/jjb/it-test/it-test.yaml @@ -18,6 +18,8 @@ name: it-test-docker-common # git repo project: it/test + # jenkins job name prefix + project-name: it-test # source of docker tag container-tag-method: yaml-file # use host network to clone from our gerrit @@ -36,7 +38,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: ric_robot_suite # dockerfile is in subdir of docker root @@ -54,7 +56,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: ric_robot_suite # dockerfile is in subdir of docker root @@ -65,3 +67,13 @@ gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: '{docker-root}/.*' + +- project: + <<: *it_test_common + name: it-test-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/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 722998a1..443e4d0e 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -35,4 +35,14 @@ - gerrit-maven-docker-stage stream: - master: - branch: master \ No newline at end of file + branch: master + +- project: + <<: *nonrtric_jdk11 + name: nonrtric-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' 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/ric-app-admin/ric-app-admin.yaml b/jjb/ric-app-admin/ric-app-admin.yaml index ceb494ac..680be6de 100644 --- a/jjb/ric-app-admin/ric-app-admin.yaml +++ b/jjb/ric-app-admin/ric-app-admin.yaml @@ -27,7 +27,7 @@ <<: *admin_docker_common name: ric-app-admin # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # source of docker tag container-tag-method: yaml-file # use host network to clone from our gerrit @@ -37,3 +37,13 @@ stream: - master: branch: master + +- project: + <<: *admin_docker_common + name: ric-app-admin-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' diff --git a/jjb/ric-app-mc/ric-app-mc.yaml b/jjb/ric-app-mc/ric-app-mc.yaml index 9d12307a..de57c8f7 100644 --- a/jjb/ric-app-mc/ric-app-mc.yaml +++ b/jjb/ric-app-mc/ric-app-mc.yaml @@ -27,7 +27,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' docker-root: mc-core # source of docker tag container-tag-method: yaml-file @@ -49,7 +49,7 @@ # jenkins job name prefix project-name: '{name}' # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' docker-root: sidecars/listener # source of docker tag container-tag-method: yaml-file @@ -65,3 +65,13 @@ - master: branch: master +- project: + <<: *mc_common + name: ric-app-mc-release + project-name: ric-app-mc + 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' diff --git a/jjb/ric-app-ml/ric-app-ml.yaml b/jjb/ric-app-ml/ric-app-ml.yaml index 88f44812..0989c974 100644 --- a/jjb/ric-app-ml/ric-app-ml.yaml +++ b/jjb/ric-app-ml/ric-app-ml.yaml @@ -27,7 +27,7 @@ <<: *ric_app_ml_docker_common name: ric-app-ml # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # root of docker build docker-root: AcumosXappAdapter # source of docker tag @@ -42,3 +42,13 @@ stream: - master: branch: master + +- project: + <<: *ric_app_ml_docker_common + name: ric-app-ml-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' diff --git a/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml b/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml new file mode 100644 index 00000000..c9238e41 --- /dev/null +++ b/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml @@ -0,0 +1,48 @@ +--- +- project: + name: scp-ocu-openlte-project-view + project-name: scp-ocu-openlte + views: + - project-view + +- project: + name: scp-ocu-openlte-info + project: scp/ocu/openlte + project-name: scp-ocu-openlte + branch: master + jobs: + - gerrit-info-yaml-verify + +- scp_ocu_openlte_common: &scp_ocu_openlte_common + # values apply to all scp/ocu/openlte docker projects + name: scp-ocu-openlte-common + # git repo + project: scp/ocu/openlte + # jenkins job name prefix + project-name: scp-ocu-openlte + # maven settings file has docker credentials + mvn-settings: scp-ocu-openlte-settings + # source of docker tag + container-tag-method: yaml-file + +- project: + <<: *scp_ocu_openlte_common + name: scp-ocu-openlte + # image name + docker-name: 'o-ran-scp/{name}' + docker-build-args: '--network=host' + jobs: + - '{project-name}-gerrit-docker-jobs' + stream: + - master: + branch: master + +- project: + <<: *scp_ocu_openlte_common + name: scp-ocu-openlte-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'