From: Jessica Wagantall Date: Thu, 21 Nov 2019 21:08:59 +0000 (+0000) Subject: Merge "Initial JJB def for kpimon repo." X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=6bc2fabe4080ce6c3a41e0e851a406222d5c90d2;hp=e7f0ed13ad04dbe4052db8785b7a184cf2bee27b;p=ci-management.git Merge "Initial JJB def for kpimon repo." --- 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/oran-jjb/oran-shell-jobs.yaml b/jjb/oran-jjb/oran-shell-jobs.yaml index 3b688536..4c5aa5a0 100644 --- a/jjb/oran-jjb/oran-shell-jobs.yaml +++ b/jjb/oran-jjb/oran-shell-jobs.yaml @@ -29,6 +29,7 @@ disable-job: false gerrit-skip-vote: false git-url: '$GIT_URL/$GERRIT_PROJECT' + mvn-global-settings: global-settings stream: master submodule-disable: false submodule-recursive: true @@ -66,7 +67,14 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' builders: + - lf-infra-pre-build + - lf-provide-maven-settings: + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + - lf-infra-create-netrc: + server-id: "{mvn-site-id}" - shell: '{script}' + - lf-provide-maven-settings-cleanup publishers: - lf-infra-publish diff --git a/jjb/pti-rtp/build-yocto.sh b/jjb/pti-rtp/build-yocto.sh new file mode 100644 index 00000000..5e9fbdca --- /dev/null +++ b/jjb/pti-rtp/build-yocto.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright (C) 2019 Wind River Systems, Inc. +# +# 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. + +# Builds a Yocto image for real. +# Assumes prereqs have already been installed. + +echo "--> build-yocto.sh" + +# Ensure we fail the job if any steps fail. +set -eu -o pipefail + +dir=workspace +echo "INFO: creating workspace $dir" +mkdir $dir +cmd="./scripts/build_oran.sh -w $dir" +echo "INFO: invoking build script: $cmd" +$cmd + +echo "--> build-yocto.sh ends" diff --git a/jjb/pti-rtp/verify-pti-rtp-centos.sh b/jjb/pti-rtp/install-yocto-prereq-centos.sh old mode 100755 new mode 100644 similarity index 75% rename from jjb/pti-rtp/verify-pti-rtp-centos.sh rename to jjb/pti-rtp/install-yocto-prereq-centos.sh index 15645511..55c2abc8 --- a/jjb/pti-rtp/verify-pti-rtp-centos.sh +++ b/jjb/pti-rtp/install-yocto-prereq-centos.sh @@ -14,10 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Installs prerequisites on CentOS then invokes the pti/rtp build script -# to test creation of a Yocto image. The "-n" flag skips bitbake. +# Installs Yocto build prerequisites on CentOS. -echo "--> verify-pti-rtp-centos.sh" +echo "--> install-yocto-prereq-centos.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail @@ -31,11 +30,4 @@ sudo yum install -y epel-release \ && sudo yum makecache \ && sudo yum install -y $pkgs -dir=workspace -echo "INFO: creating workspace $dir" -mkdir $dir -cmd="./scripts/build_oran.sh -w $dir -n" -echo "INFO: invoking build script: $cmd" -$cmd - -echo "--> verify-pti-rtp-centos.sh ends" +echo "--> install-yocto-prereq-centos.sh ends" diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml index 14f231e6..07fd3c44 100644 --- a/jjb/pti-rtp/pti-rtp.yaml +++ b/jjb/pti-rtp/pti-rtp.yaml @@ -13,14 +13,36 @@ jobs: - gerrit-info-yaml-verify -- project: - name: pti-rtp-verify +- pti_rtp_common: &pti_rtp_common + name: pti-rtp-common + # git repo project: pti/rtp + # jenkins job name prefix project-name: pti-rtp + # maven settings file has credentials + mvn-settings: pti-rtp-settings # use a centos with big memory; docker not required build-node: centos7-docker-2c-8g - # runs about 30 minutes + +- project: + <<: *pti_rtp_common + name: pti-rtp-verify + # runs about 40 minutes build-timeout: 60 - script: !include-raw-escape: verify-pti-rtp-centos.sh + script: !include-raw-escape: + - install-yocto-prereq-centos.sh + - verify-yocto.sh jobs: - oran-shell-verify + +- project: + <<: *pti_rtp_common + name: pti-rtp-merge + # runs about 9 hours + build-timeout: 600 + script: !include-raw-escape: + - install-yocto-prereq-centos.sh + - build-yocto.sh + - upload-yocto.sh + jobs: + - oran-shell-merge diff --git a/jjb/pti-rtp/upload-yocto.sh b/jjb/pti-rtp/upload-yocto.sh new file mode 100644 index 00000000..35b4baea --- /dev/null +++ b/jjb/pti-rtp/upload-yocto.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +# Copyright (C) 2019 Wind River Systems, Inc. +# +# 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. + +# Uploads a Yocto image to Nexus. + +echo "--> upload-yocto.sh" + +# Ensure we fail the job if any steps fail. +set -eu -o pipefail + +echo "INFO: creating virtual environment" +virtualenv -p python3 /tmp/venv +PATH=/tmp/venv/bin:$PATH +pipup="python -m pip install -q --upgrade lftools" +echo "INFO: installing packages: $pipup" +$pipup + +# NEXUS_URL is set by Jenkins +nexus_repo_id="images" +nexus_repo_url="$NEXUS_URL/content/sites/$nexus_repo_id" +echo "INFO: upload to $nexus_repo_url" + +repo_dir="$WORKSPACE/nexus/$nexus_repo_id" +# TODO: get build or version string; use latest for now +repo_iso_dir="$repo_dir/org/o-ran-sc/pti/rtp/latest" +echo "INFO: create staging directory $repo_iso_dir" +mkdir -p "$repo_iso_dir" + +# Expect ISO file: oran-image-inf-host-intel-x86-64.iso +# in build subdir: workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/ +iso="workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso" +echo "INFO: copy $iso to staging directory $repo_iso_dir" +cp "$iso" "$repo_iso_dir" + +cmd="lftools deploy nexus $nexus_repo_url $repo_dir" +echo "INFO: Upload ISO to Nexus: $cmd" +$cmd + +echo "--> upload-yocto.sh ends" diff --git a/jjb/pti-rtp/verify-yocto.sh b/jjb/pti-rtp/verify-yocto.sh new file mode 100644 index 00000000..da13788f --- /dev/null +++ b/jjb/pti-rtp/verify-yocto.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright (C) 2019 Wind River Systems, Inc. +# +# 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. + +# Tests creation of a Yocto image. The "-n" flag skips bitbake. +# Assumes prereqs have already been installed. + +echo "--> verify-yocto.sh" + +# Ensure we fail the job if any steps fail. +set -eu -o pipefail + +dir=workspace +echo "INFO: creating workspace $dir" +mkdir $dir +cmd="./scripts/build_oran.sh -w $dir -n" +echo "INFO: invoking build script: $cmd" +$cmd + +echo "--> verify-yocto.sh ends" 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/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml index aa830961..6d22ad7c 100644 --- a/jjb/ric-plt-a1/ric-plt-a1.yaml +++ b/jjb/ric-plt-a1/ric-plt-a1.yaml @@ -27,7 +27,7 @@ <<: *a1_common name: ric-plt-a1 # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # source of docker tag container-tag-method: yaml-file # use host network @@ -70,3 +70,13 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' jobs: - gerrit-tox-sonar + +- project: + <<: *a1_common + name: ricc-plt-a1-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-plt-appmgr/ric-plt-appmgr.yaml b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml index 087a91be..7f834e2e 100644 --- a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml +++ b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml @@ -27,7 +27,7 @@ <<: *appmgr_docker_common name: ric-plt-appmgr # 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: + <<: *appmgr_docker_common + name: ric-plt-appmgr-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-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml index 0fc854b1..06d4fced 100644 --- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml +++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml @@ -27,7 +27,7 @@ <<: *dbaas_docker_common name: ric-plt-dbaas # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # Specify docker file and host network docker-build-args: '--network=host -f docker/Dockerfile.redis' # source of docker tag @@ -37,3 +37,13 @@ stream: - master: branch: master + +- project: + <<: *dbaas_docker_common + name: ric-plt-dbaas-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-plt-e2/ric-plt-e2.yaml b/jjb/ric-plt-e2/ric-plt-e2.yaml index 7d4af25d..81e32cee 100644 --- a/jjb/ric-plt-e2/ric-plt-e2.yaml +++ b/jjb/ric-plt-e2/ric-plt-e2.yaml @@ -27,7 +27,7 @@ <<: *e2_docker_common name: ric-plt-e2 # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # subdirectory docker-root: RIC-E2-TERMINATION # source of docker tag @@ -39,3 +39,13 @@ stream: - master: branch: master + +- project: + <<: *e2_docker_common + name: ric-plt-e2-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-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml index 9889b3c7..55ace218 100644 --- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml +++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml @@ -27,7 +27,7 @@ <<: *e2mgr_docker_common name: ric-plt-e2mgr # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # Dockerfile is in a subdir docker-root: E2Manager # source of docker tag @@ -39,3 +39,13 @@ stream: - master: branch: master + +- project: + <<: *e2mgr_docker_common + name: ric-plt-e2mgr-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-plt-resource-status-manager/ric-plt-resource-status-manager.yaml b/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml index 805702dd..8bba9047 100644 --- a/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml +++ b/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml @@ -27,7 +27,7 @@ <<: *resource_status_manager_docker_common name: ric-plt-resource-status-manager # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # Dockerfile is in a subdir docker-root: RSM # source of docker tag @@ -39,3 +39,13 @@ stream: - master: branch: master + +- project: + <<: *resource_status_manager_docker_common + name: ric-plt-resource-status-manager-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-plt-rtmgr/ric-plt-rtmgr.yaml b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml index 315979cb..2241bcd6 100644 --- a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml +++ b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml @@ -27,7 +27,7 @@ <<: *rtmgr_docker_common name: ric-plt-rtmgr # 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: + <<: *rtmgr_docker_common + name: ric-plt-rtmgr-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-plt-submgr/ric-plt-submgr.yaml b/jjb/ric-plt-submgr/ric-plt-submgr.yaml index 384a0009..9607501b 100644 --- a/jjb/ric-plt-submgr/ric-plt-submgr.yaml +++ b/jjb/ric-plt-submgr/ric-plt-submgr.yaml @@ -27,7 +27,7 @@ <<: *submgr_docker_common name: ric-plt-submgr # 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: + <<: *submgr_docker_common + name: ric-plt-submgr-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-plt-vespamgr/ric-plt-vespamgr.yaml b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml index df44cf9d..5282f988 100644 --- a/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml +++ b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml @@ -27,7 +27,7 @@ <<: *vespamgr_docker_common name: ric-plt-vespamgr # image name - docker-name: '{name}' + docker-name: 'o-ran-sc/{name}' # source of docker tag container-tag-method: yaml-file # use host network @@ -37,3 +37,13 @@ stream: - master: branch: master + +- project: + <<: *vespamgr_docker_common + name: ric-plt-vespamgr-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'