From: Anil Belur Date: Tue, 20 Sep 2022 22:25:51 +0000 (+0000) Subject: Merge "Chore: Automation adds aiml-fw-aihp-tps-kserve-adapter.yaml" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1af853d2eafa081daeb8749aadaf42c366e9a6f0;hp=b6a4dbbf9de07095f51169da4b3320828c99c222;p=ci-management.git Merge "Chore: Automation adds aiml-fw-aihp-tps-kserve-adapter.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/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml new file mode 100644 index 00000000..b59f2942 --- /dev/null +++ b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aiml-fw-athp-data-extraction-project-view + project-name: aiml-fw-athp-data-extraction + views: + - project-view + +- project: + name: aiml-fw-athp-data-extraction-info + project: aiml-fw/athp/data-extraction + project-name: aiml-fw-athp-data-extraction + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/aiml-fw/aiml-fw.yaml b/jjb/aiml-fw/aiml-fw.yaml new file mode 100644 index 00000000..aeb6e02f --- /dev/null +++ b/jjb/aiml-fw/aiml-fw.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aiml-fw-project-view + project-name: aiml-fw + views: + - project-view + +- project: + name: aiml-fw-info + project: aiml-fw + project-name: aiml-fw + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify \ No newline at end of file diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml index fd94438e..73958916 100644 --- a/jjb/smo-ves/smo-ves.yaml +++ b/jjb/smo-ves/smo-ves.yaml @@ -22,6 +22,8 @@ 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 @@ -156,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