Merge "Build configurations for ric-app-hw-rust"

diff --git a/global-jjb b/global-jjb
index 42fbb1b..ac8fb0e 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 42fbb1b57b7f344ef6193fb5391d787c5ade86ca
+Subproject commit ac8fb0e75cdcbeb4812e620ecc68f9631b90e507

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 8a6a635..6b84897 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 - 20220920-114402.749
+LABELS=ubuntu2004-builder-2c-2g
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20230406-184331.809
 HARDWARE_ID=v2-highcpu-2
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg
new file mode 100644 (file)
index 0000000..8a6a635
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg
@@ -0,0 +1,4 @@
+LABELS=ubuntu1804-builder-2c-2g
+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/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
new file mode 100644 (file)
index 0000000..25329fc
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
@@ -0,0 +1,4 @@
+LABELS=ubuntu2004-builder-4c-4g
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20230406-184331.809
+HARDWARE_ID=v2-highcpu-4
+VOLUME_SIZE=20

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

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-kserve-adapter/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-kserve-adapter/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-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-ips-kserve-adapter/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-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-ips-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-ips-kserve-adapter/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-kserve-adapter/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..d2832cf
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-aihp-ips-kserve-adapter/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "releases"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
+  - serverId: "snapshots"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
+  - serverId: "staging"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
+  - serverId: "site"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10001"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10002"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10003"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
+  - serverId: "nexus3.o-ran-sc.org:10004"
+    credentialsId: "aiml-fw-aihp-ips-kserve-adapter"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/config-params.yaml
new file mode 100644 (file)
index 0000000..714910d
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "ric-app-ad-cell"
+comment: "ric-app-ad-cell"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/content b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/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-app-ad-cell/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/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/ric-app-ad-cell/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..6799801
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-app-ad-cell/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "releases"
+    credentialsId: "ric-app-ad-cell"
+  - serverId: "snapshots"
+    credentialsId: "ric-app-ad-cell"
+  - serverId: "staging"
+    credentialsId: "ric-app-ad-cell"
+  - serverId: "site"
+    credentialsId: "ric-app-ad-cell"
+  - serverId: "nexus3.o-ran-sc.org:10001"
+    credentialsId: "ric-app-ad-cell"
+  - serverId: "nexus3.o-ran-sc.org:10002"
+    credentialsId: "ric-app-ad-cell"
+  - serverId: "nexus3.o-ran-sc.org:10003"
+    credentialsId: "ric-app-ad-cell"
+  - serverId: "nexus3.o-ran-sc.org:10004"
+    credentialsId: "ric-app-ad-cell"
\ No newline at end of file

diff --git a/jjb/aiml-fw-aihp-ips-kserve-adapter/aiml-fw-aihp-ips-kserve-adapter.yaml b/jjb/aiml-fw-aihp-ips-kserve-adapter/aiml-fw-aihp-ips-kserve-adapter.yaml
new file mode 100644 (file)
index 0000000..9a9c767
--- /dev/null
+++ b/jjb/aiml-fw-aihp-ips-kserve-adapter/aiml-fw-aihp-ips-kserve-adapter.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: aiml-fw-aihp-ips-kserve-adapter-project-view
+    project-name: aiml-fw-aihp-ips-kserve-adapter
+    views:
+      - project-view
+
+- project:
+    name: aiml-fw-aihp-ips-kserve-adapter-info
+    project: aiml-fw/aihp/ips/kserve-adapter
+    project-name: aiml-fw-aihp-ips-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/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml
index ae26de1..4181e58 100644 (file)
--- a/jjb/ci-management/ci-packer.yaml
+++ b/jjb/ci-management/ci-packer.yaml
@@ -29,6 +29,7 @@
       - centos-7
       - centos-8
       - ubuntu-18.04
+      - ubuntu-20.04
 
 - project:
     name: packer-docker-jobs

diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
index 631c5b0..ae042ee 100644 (file)
--- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-helmmanager-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *helmmanager_jdk_common
@@ -35,8 +35,10 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 # nonrtric:helmmanager
@@ -54,8 +56,10 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 - project:

diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
index 3fc481d..ced8de8 100644 (file)
--- a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
+++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
@@ -12,4 +12,86 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
+
+- nonrtric-plt-ranpm_common: &nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-common
+    # git repo
+    project: nonrtric/plt/ranpm
+    # jenkins job name prefix
+    project-name: nonrtric-plt-ranpm
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-ranpm-settings
+    mvn-version: mvn36
+    java-version: openjdk17
+
+- project:
+    <<: *nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-gerrit-release
+    project-name: nonrtric-plt-ranpm
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+# Jobs for nonrtric-plt-ranpm-datafilecollector
+- project:
+    <<: *nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-datafilecollector-gerrit-maven-docker
+    #job name prefix
+    project-name: nonrtric-plt-ranpm-datafilecollector
+    mvn-params: '-f datafilecollector -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'datafilecollector/.*'
+    jobs:
+      - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+      - gerrit-maven-docker-verify
+    stream:
+      - master:
+          branch: master
+
+# Jobs for nonrtric-plt-ranpm-pmproducer
+- project:
+    <<: *nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-pmproducer-gerrit-maven-docker
+    #job name prefix
+    project-name: nonrtric-plt-ranpm-pmproducer
+    mvn-params: '-f pmproducer -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'pmproducer/.*'
+    jobs:
+      - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+      - gerrit-maven-docker-verify
+    stream:
+      - master:
+          branch: master
+
+# Jobs for nonrtric-plt-ranpm-influxlogger
+- project:
+    <<: *nonrtric_plt_ranpm_jdk_common
+    name: nonrtric-plt-ranpm-influxlogger-gerrit-maven-docker
+    #job name prefix
+    project-name: nonrtric-plt-ranpm-influxlogger
+    mvn-params: '-f influxlogger -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'influxlogger/.*'
+    jobs:
+      - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+      - gerrit-maven-docker-verify
+    stream:
+      - master:
+          branch: master
+

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 1008f6e..2e194f1 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-rappcatalogue-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -35,8 +35,10 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 # nonrtric:rappcatalogue
@@ -54,8 +56,10 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 - project:

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index f1769e0..b54e6ac 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -24,27 +24,6 @@
     mvn-version: mvn36
     java-version: openjdk17
 
-# nonrtric:pm-pmlogger-influx
-# Maven artifacts for nonrtric:pm-pmlogger-influx
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-plt-pm-pmlogger-influx
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f pmlog -Dbuild.number=${{BUILD_NUMBER}}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'pmlog/.*'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      # Disable stage for now (Will move to another repo before release)     - gerrit-maven-stage
-      # Disable clm for now  (Will move to another repo before release)     - gerrit-maven-clm
-    stream:
-      - master:
-          branch: master
-
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-kafka-procon

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index efabbb2..25863bb 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -23,7 +23,7 @@
     # maven settings file has docker credentials
     mvn-settings: portal-nonrtric-controlpanel-settings
     # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: mvn36
     sonarcloud-project-key: "portal-nonrtric-controlpanel"
     sonarcloud-project-organization: "o-ran-sc"
@@ -52,11 +52,8 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 - project:
@@ -113,11 +110,8 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 - project:
@@ -138,10 +132,7 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 

diff --git a/jjb/ric-app-ad-cell/ric-app-ad-cell.yaml b/jjb/ric-app-ad-cell/ric-app-ad-cell.yaml
new file mode 100644 (file)
index 0000000..41cce03
--- /dev/null
+++ b/jjb/ric-app-ad-cell/ric-app-ad-cell.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: ric-app-ad-cell-project-view
+    project-name: ric-app-ad-cell
+    views:
+      - project-view
+
+- project:
+    name: ric-app-ad-cell-info
+    project: ric-app/ad-cell
+    project-name: ric-app-ad-cell
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file