From: Jessica Wagantall Date: Tue, 19 Nov 2019 17:50:27 +0000 (+0000) Subject: Merge "JJB definitioin for O-DU L2" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=7df06ff6544a351bc675259a08b7c2aec82a8162;hp=6edeff7ab5aef878376a69e237e50a663c3708a1;p=ci-management.git Merge "JJB definitioin for O-DU L2" --- 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/portal-ric-dashboard/portal-ric-dashboard.yaml b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml index 45593767..89402874 100644 --- a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml +++ b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml @@ -59,3 +59,13 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-maven-sonar + +- project: + <<: *portal_ric_dashboard_common + name: portal-ric-dashboard-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-ml/ric-app-ml.yaml b/jjb/ric-app-ml/ric-app-ml.yaml new file mode 100644 index 00000000..88f44812 --- /dev/null +++ b/jjb/ric-app-ml/ric-app-ml.yaml @@ -0,0 +1,44 @@ +--- +- project: + name: ric-app-ml-project-view + project-name: ric-app-ml + views: + - project-view + +- project: + name: ric-app-ml-info + project: ric-app/ml + project-name: ric-app-ml + build-node: centos7-builder-1c-1g + jobs: + - gerrit-info-yaml-verify + +- ric_app_ml_docker_common: &ric_app_ml_docker_common + # values apply to all ml docker projects + name: ric-app-ml-docker-common + # git repo + project: ric-app/ml + # jenkins job name prefix + project-name: ric-app-ml + # maven settings file has docker credentials + mvn-settings: ric-app-ml-settings + +- project: + <<: *ric_app_ml_docker_common + name: ric-app-ml + # image name + docker-name: '{name}' + # root of docker build + docker-root: AcumosXappAdapter + # source of docker tag + container-tag-method: yaml-file + # use host network to clone from our gerrit + 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 diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml new file mode 100644 index 00000000..cc95d209 --- /dev/null +++ b/jjb/sim-o1-interface/sim-o1-interface.yaml @@ -0,0 +1,82 @@ +--- +- project: + name: sim-o1-interface-project-view + project-name: sim-o1-interface + views: + - project-view + +- project: + name: sim-o1-interface-info + project: sim/o1-interface + project-name: sim-o1-interface + branch: master + jobs: + - gerrit-info-yaml-verify + +- sim_o1_interface_common: &sim_o1_interface_common + # values apply to all sim/o1-interface docker projects + 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 + container-tag-method: yaml-file + +- project: + <<: *sim_o1_interface_common + name: sim-o1-interface-manager + # jenkins job name prefix + project-name: '{name}' + # image 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' + # tag file is in subdir + container-tag-yaml-dir: ntsimulator/deploy/manager + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'ntsimulator/deploy/manager/.*' + - compare-type: REG_EXP + pattern: 'ntsimulator/src/ntsimulator-manager/.*' + - compare-type: REG_EXP + pattern: 'ntsimulator/yang/manager/.*' + jobs: + - '{project-name}-gerrit-docker-jobs' + stream: + - master: + branch: master + +- project: + <<: *sim_o1_interface_common + name: sim-o1-interface-device + # jenkins job name prefix + project-name: '{name}' + # image 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' + # tag file is in subdir + container-tag-yaml-dir: ntsimulator/deploy + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'ntsimulator/.*' + jobs: + - '{project-name}-gerrit-docker-jobs' + 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'