From: Anil Belur Date: Tue, 20 Sep 2022 22:21:29 +0000 (+0000) Subject: Merge "Chore: Automation adds aiml-fw.yaml" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=fc86a592b7c973764d7ab6c777f63b582ccff0b0;hp=8fb59d1218c4477dbb735081740040560bba2804;p=ci-management.git Merge "Chore: Automation adds aiml-fw.yaml" --- diff --git a/global-jjb b/global-jjb index a09b8bab..abb522a7 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit a09b8bab2c37f67f0f5e9ef36f9e93b330fdd571 +Subproject commit abb522a78975595e92197da01d72fbd2a1175085 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg index e397b830..82f2a7df 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-builder-1c-1g -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210930-234326.587 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220920-131540.754 HARDWARE_ID=v2-highcpu-1 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg index 23bda504..ad15aa3a 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g-200g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20210930-234402.929 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220920-131539.732 HARDWARE_ID=v2-standard-2 VOLUME_SIZE=200 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg index 06e9e36a..eea581b3 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20210930-234402.929 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220920-131539.732 HARDWARE_ID=v2-standard-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 2b8d75e0..c703e264 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=sjc1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210930-234326.587 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220920-131540.754 VOLUME_SIZE=20 HARDWARE_ID=v2-highcpu-1 NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg index c6edac7d..8a6a635d 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-2c-2g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220920-114402.749 HARDWARE_ID=v2-highcpu-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index d3310896..17f89066 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-4c-4g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220920-114402.749 HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg index dfe35b9a..1cd6177e 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-docker-4c-4g -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211006-230325.518 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220920-113903.122 HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=20 diff --git a/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml b/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml index ac82973b..f4c5a6f1 100644 --- a/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml +++ b/jjb/ric-plt-ricdms/ric-plt-ricdms.yaml @@ -5,6 +5,16 @@ views: - project-view +- ricdms_common: &ricdms_common + # values apply to all projects + name: ricdms-common + # git repo + project: ric-plt/ricdms + # jenkins prefix + project-name: ric-plt-ricdms + # maven settings file has docker credentials + mvn-settings: ric-plt-ricdms-settings + - project: name: ric-plt-ricdms-info project: ric-plt/ricdms @@ -12,3 +22,33 @@ build-node: centos7-builder-1c-1g jobs: - gerrit-info-yaml-verify + +# create docker image when source changes +- project: + <<: *ricdms_common + name: ric-plt-ricdms + # image name + docker-name: 'o-ran-sc/{name}' + # source of docker tag + container-tag-method: yaml-file + # use host network to clone from our gerrit + docker-build-args: '--network=host' + # trigger on any change other than a file in ./docs + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '^((?!docs/|\/COMMIT_MSG).)*$' + jobs: + - '{project-name}-gerrit-docker-jobs' + stream: + - master: + branch: master + +# push nexus image from staging to release +- project: + <<: *ricdms_common + name: ric-plt-ricdms-release + # 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-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml index bc67ea88..0cb1be6f 100644 --- a/jjb/sim-a1-interface/sim-a1-interface.yaml +++ b/jjb/sim-a1-interface/sim-a1-interface.yaml @@ -37,6 +37,8 @@ stream: - master: branch: master + - f-release: + branch: f-release jobs: - '{project-name}-gerrit-docker-jobs' @@ -64,5 +66,10 @@ # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g + stream: + - master: + branch: master + - f-release: + branch: f-release jobs: - '{project-name}-gerrit-release-jobs' \ No newline at end of file diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml index 9526fa02..73958916 100644 --- a/jjb/smo-ves/smo-ves.yaml +++ b/jjb/smo-ves/smo-ves.yaml @@ -22,13 +22,15 @@ project-name: smo-ves # maven settings file has docker credentials mvn-settings: smo-ves-settings + sonarcloud-project-key: "smo-ves" + sonarcloud-project-organization: "o-ran-sc" - project: <<: *ves_docker_common - name: smo-ves + name: smo-ves-collector project-name: '{name}' # image name - docker-name: 'smo-collector' + docker-name: 'o-ran-sc/{name}' # Dockerfile is in a subdir docker-root: collector # source of docker tag @@ -41,10 +43,10 @@ - project: <<: *ves_docker_common - name: smo-dmaap + name: smo-ves-dmaap-adapter project-name: '{name}' # image name - docker-name: 'smo-dmaap-adapter' + docker-name: 'o-ran-sc/{name}' # Dockerfile is in a subdir docker-root: dmaapadapter # source of docker tag @@ -57,10 +59,10 @@ - project: <<: *ves_docker_common - name: smo-influxdb + name: smo-ves-influxdb-connector project-name: '{name}' # image name - docker-name: 'smo-influxdb-connector' + docker-name: 'o-ran-sc/{name}' # Dockerfile is in a subdir docker-root: influxdb-connector # source of docker tag @@ -72,10 +74,10 @@ branch: master - project: <<: *ves_docker_common - name: smo-postconfig + name: smo-ves-post-config project-name: '{name}' # image name - docker-name: 'smo-post-config' + docker-name: 'o-ran-sc/{name}' # Dockerfile is in a subdir docker-root: postconfig # source of docker tag @@ -88,7 +90,7 @@ - project: <<: *ves_docker_common - name: smo-ves-release + name: smo-ves-collector-release project-name: '{name}' # maven release requires sigul which requires centos # container release requires docker @@ -98,7 +100,7 @@ - project: <<: *ves_docker_common - name: smo-dmaap-release + name: smo-ves-dmaap-adapter-release project-name: '{name}' # maven release requires sigul which requires centos # container release requires docker @@ -108,7 +110,17 @@ - project: <<: *ves_docker_common - name: smo-influxdb-release + name: smo-ves-influxdb-connector-release + project-name: '{name}' + # maven release requires sigul which requires centos + # container release requires docker + build-node: centos7-docker-2c-8g + jobs: + - '{project-name}-gerrit-release-jobs' + +- project: + <<: *ves_docker_common + name: smo-ves-post-config-release project-name: '{name}' # maven release requires sigul which requires centos # container release requires docker @@ -146,3 +158,4 @@ sonar.python.coverage.reportPaths=coverage.xml jobs: - gerrit-tox-sonar + - gerrit-cli-sonar diff --git a/packer/common-packer b/packer/common-packer index 1bbdb3b9..b8bffd62 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 1bbdb3b9477f25d71bc75862d9fb6f3aa69a924a +Subproject commit b8bffd625cbf589079fcfd9ba1a37c91fdc7f99b