Merge "Align project names in Sonar for nonrtric projects"

diff --git a/global-jjb b/global-jjb
index 5ae273f..abb522a 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 5ae273f51ca03aa5e02d1c146e2c73757bd7efae
+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 e397b83..82f2a7d 100644 (file)
--- 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 23bda50..ad15aa3 100644 (file)
--- 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 06e9e36..eea581b 100644 (file)
--- 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 2b8d75e..c703e26 100644 (file)
--- 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 c6edac7..8a6a635 100644 (file)
--- 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 d331089..17f8906 100644 (file)
--- 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 dfe35b9..1cd6177 100644 (file)
--- 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/jenkins-config/managed-config-files/custom/pipconf/content b/jenkins-config/managed-config-files/custom/pipconf/content
index 8b13789..6581d0e 100644 (file)
--- a/jenkins-config/managed-config-files/custom/pipconf/content
+++ b/jenkins-config/managed-config-files/custom/pipconf/content
@@ -1 +1,3 @@
-
+[global]
+timeout = 60
+index-url = https://nexus3.o-ran-sc.org/repository/PyPi/simple

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml
new file mode 100644 (file)
index 0000000..b029ec6
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "aiml-fw-aihp-tps-kserve-adapter"
+comment: "aiml-fw-aihp-tps-kserve-adapter"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..300e05a
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-tps-kserve-adapter/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "releases"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
+  - serverId: "snapshots"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
+  - serverId: "staging"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
+  - serverId: "site"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10001"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10002"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10003"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10004"
+    credentialsId: "aiml-fw-aihp-tps-kserve-adapter"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml
new file mode 100644 (file)
index 0000000..f9c3373
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "aiml-fw-athp-data-extraction"
+comment: "aiml-fw-athp-data-extraction"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..1e9edf1
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-athp-data-extraction/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "releases"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "snapshots"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "staging"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "site"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10001"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10002"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10003"
+    credentialsId: "aiml-fw-athp-data-extraction"
+  - serverId: "nexus3.o-ran-sc.org:10004"
+    credentialsId: "aiml-fw-athp-data-extraction"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..81ca616
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "ric-plt-ricdms-settings"
+comment: "ric-plt-ricdms-settings"

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/content b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..5813aff
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-ricdms-settings/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "releases"
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "staging"
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "site"
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "snapshots"
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "nexus3.o-ran-sc.org:10001"
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "nexus3.o-ran-sc.org:10002"
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "nexus3.o-ran-sc.org:10003"
+  - credentialsId: "ric-plt-ricdms"
+    serverId: "nexus3.o-ran-sc.org:10004"

diff --git a/jjb/aiml-fw-aihp-tps-kserve-adapter/aiml-fw-aihp-tps-kserve-adapter.yaml b/jjb/aiml-fw-aihp-tps-kserve-adapter/aiml-fw-aihp-tps-kserve-adapter.yaml
new file mode 100644 (file)
index 0000000..118779f
--- /dev/null
+++ b/jjb/aiml-fw-aihp-tps-kserve-adapter/aiml-fw-aihp-tps-kserve-adapter.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: aiml-fw-aihp-tps-kserve-adapter-project-view
+    project-name: aiml-fw-aihp-tps-kserve-adapter
+    views:
+      - project-view
+
+- project:
+    name: aiml-fw-aihp-tps-kserve-adapter-info
+    project: aiml-fw/aihp/tps/kserve-adapter
+    project-name: aiml-fw-aihp-tps-kserve-adapter
+    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-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 (file)
index 0000000..b59f294
--- /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 (file)
index 0000000..aeb6e02
--- /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 fd94438..7395891 100644 (file)
--- 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