From: wrider Date: Tue, 19 Nov 2019 06:00:23 +0000 (-0500) Subject: Prepare for docker image release for all RICP repos X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=5bf12754bc361f2a4ae941f1a97c2c7ff0447936 Prepare for docker image release for all RICP 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: I06abb9c5439b61b94a8946170aaadff64235b714 Signed-off-by: wrider --- 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'