From: wrider Date: Tue, 19 Nov 2019 05:45:23 +0000 (-0500) Subject: Prepare for docker image release for RICAPP repos X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=aa7f783e20194fb586c2474ecfef9e0f40ee9b67;p=ci-management.git Prepare for docker image release for RICAPP repos Two changes for preparing for docker image release on JJB definitions for repos that produce docker iamges: 1. per ToC meetiing on 11/13, we need to prefix docker image name with o-ran-sc; 2. define a self-service docker image release job. Change-Id: Icc8474e7eec44c71ba1388eae918117cdc5079aa Signed-off-by: wrider --- 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'