Merge "Chore: Automation adds ric-app-kpimon-go.yaml"

diff --git a/INFO.yaml b/INFO.yaml
index 68dcbdb..4105bdb 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -57,10 +57,39 @@ committers:
     email: "mjethanandani@gmail.com"
     company: "Xoriant Corporation"
     id: "mjethanandani"
-    timezone: "America/Los_Angeles”
+    timezone: "America/Los_Angeles"
+  - name: "John Keeney"
+    email: "John.Keeney@est.tech"
+    id: "johnkeeney"
+    company: "Ericsson Software Technology"
+    timezone: "Europe/Dublin"
+  - name: "Martin Skorupski"
+    email: "martin.skorupski@highstreet-technologies.com"
+    id: "demx8as6"
+    company: "highstreet technologies GmbH"
+    timezone: "Germany/Berlin"
+  - name: "Alex Stancu"
+    email: "alexandru.stancu@highstreet-technologies.com"
+    id: "alex.stancu"
+    company: "highstreet technologies GmbH"
+    timezone: "Europe/Bucharest"
 tsc:
+  # yamllint disable rule:line-length
   approval: "https://wiki.o-ran-sc.org/display/TOC"
   changes:
-    - type: "Committers Rights to ci-mangement repo"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i SMO PTL"
       name: "Mahesh Jethanandani"
-      link: "ORANSCTechnicalOversightCommittee(TOC)-20220505"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i NONRTRIC PTL"
+      name: "John Keeney"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i OAM PTL"
+      name: "Martin Skorupski"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i SIM PTL"
+      name: "Alex Stancu"

diff --git a/global-jjb b/global-jjb
index 77f06cb..2197ea7 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 77f06cb5e687962c7f999c80fbcf2a6b31042afd
+Subproject commit 2197ea74fc67fcad41f47751d226390a930c1da7

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index d1bf6e7..c69992e 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -8,7 +8,7 @@ REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+o-ran-sc-release@linuxfoundation.org
 RELEASE_USERNAME=o-ran-sc-release
 S3_BUCKET=
-SIGUL_BRIDGE_IP=54.200.225.191
+SIGUL_BRIDGE_IP=54.71.144.162
 SIGUL_KEY=oran-release-2022
 SILO=production
 MASTER_RTD_PROJECT=doc

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 25faaaa..19f31e5 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -6,7 +6,7 @@ LOGS_SERVER=https://logs.o-ran-sc.org
 NEXUS_URL=https://nexus.o-ran-sc.org
 REGISTRY_PORTS=10001 10002 10003 10004
 S3_BUCKET=
-SIGUL_BRIDGE_IP=54.200.225.191
+SIGUL_BRIDGE_IP=54.71.144.162
 SIGUL_KEY=oran-sandbox
 SILO=sandbox
 MASTER_RTD_PROJECT=doc-test

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 314ddf9..b2ea3a5 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:a1policymanagementservice/
 # Maven artifacts for nonrtric-plt-a1policymanagementservice/
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -58,3 +62,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+

diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 095d12f..1d644f8 100644 (file)
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:dmaapadapter/
 # Maven artifacts for nonrtric-plt-dmaapadapter/
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *dmaapadapter_jdk_common

diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
index 87dc30b..8c6bc5a 100644 (file)
--- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
+++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
@@ -50,9 +50,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
+      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *dmaapmediatorproducer_common

diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
index 21c25fb..c88df2c 100644 (file)
--- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:helmmanager
 # Maven artifacts for helmmanager
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *helmmanager_jdk_common

diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 6b09c64..602ee42 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:informationcoordinatorservice
 # Maven artifacts for nonrtric-plt-informationcoordinatorservice
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *informationcoordinatorservice_jdk_common

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 7451d7a..63402d2 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:rappcatalogue
 # Maven artifacts for rappcatalogue
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *rappcatalogue_jdk_common

diff --git a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
index f512695..6e70930 100644 (file)
--- a/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
+++ b/jjb/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller.yaml
@@ -34,6 +34,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 # nonrtric:nonrtric-plt-sdnca1controller
 # Maven artifacts for nonrtric-plt-sdnca1controller
@@ -49,6 +51,8 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *sdnca1controller_jdk_common

diff --git a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
index 8f7e2df..d08b395 100644 (file)
--- a/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
+++ b/jjb/nonrtric-rapp-healthcheck/nonrtric-rapp-healthcheck.yaml
@@ -39,3 +39,6 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+

diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
index fde717c..b995a3f 100644 (file)
--- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
+++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
@@ -44,9 +44,12 @@
     # Includes verify and merge jobs
     jobs:
       - "{project-name}-gerrit-docker-jobs"
+      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *orufhrecovery_common
@@ -71,9 +74,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
+      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *orufhrecovery_common

diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
index adab68c..0618200 100644 (file)
--- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
+++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
@@ -50,9 +50,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
+      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *ransliceassurance_common
@@ -73,9 +76,12 @@
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
+      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *ransliceassurance_common
@@ -90,4 +96,4 @@
     # use sonarcloud values from defaults.yaml
     sonar-properties: !include-raw: sonar-project.properties
     jobs:
-      - gerrit-sonar-prescan-script
\ No newline at end of file
+      - gerrit-sonar-prescan-script

diff --git a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
index ca0f539..50fec4c 100644 (file)
--- a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
+++ b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
@@ -32,6 +32,8 @@
     pre-build: !include-raw-escape:
       - ../shell/install-deb-alien.sh
       - ../shell/install-deb-rmr.sh
+      - ../shell/install-deb-cpprest.sh
+      - ../shell/install-git-pistache.sh
     # skip install in cmake-build.sh
     install: false
 

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

diff --git a/jjb/shell/install-deb-cpprest.sh b/jjb/shell/install-deb-cpprest.sh
new file mode 100644 (file)
index 0000000..2fcf698
--- /dev/null
+++ b/jjb/shell/install-deb-cpprest.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# O-RAN-SC
+#
+# Copyright (C) 2020 AT&T Intellectual Property and Nokia
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Installs Debian package 'alien' to support building RPMs
+
+echo "---> install-deb-cpprest.sh"
+
+# stop on error or unbound var, and be chatty
+set -eux
+sudo apt-get update --fix-missing && sudo apt-get -y install libcpprest-dev
+
+echo "---> install-deb-cpprest.sh ends"

diff --git a/jjb/shell/install-git-pistache.sh b/jjb/shell/install-git-pistache.sh
new file mode 100644 (file)
index 0000000..c8db9a8
--- /dev/null
+++ b/jjb/shell/install-git-pistache.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# O-RAN-SC
+#
+# Copyright (C) 2020 AT&T Intellectual Property and Nokia
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Installs Debian package 'pistache' to support building RPMs
+
+echo "---> install-git-pistache.sh"
+
+# stop on error or unbound var, and be chatty
+set -eux
+echo "---> install Pistache dependencies..."
+
+if type -P python3 > /dev/null 2>&1
+then
+    echo "Python3 is installed"
+else
+    sudo apt-get install python3
+fi
+
+sudo apt-get update && sudo apt-get -y install rapidjson-dev libssl-dev
+python3 -m pip install meson
+
+echo "---> install Pistache library.."
+
+LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
+
+git clone https://github.com/pistacheio/pistache.git && cd pistache && meson setup build \
+    --buildtype=release \
+    -DPISTACHE_USE_SSL=true \
+    -DPISTACHE_BUILD_EXAMPLES=false \
+    -DPISTACHE_BUILD_TESTS=false \
+    -DPISTACHE_BUILD_DOCS=false \
+    --prefix="$PWD/prefix" \
+     meson install -C build && \
+     sudo cp -rf prefix/include/pistache /usr/include/pistache && \
+     sudo cp prefix/lib/x86_64-linux-gnu/libpistache.so.0.0.3 $LIBRARY_PATH && \
+     sudo ln -s $LIBRARY_PATH/libpistache.so.0.0.3 $LIBRARY_PATH/libpistache.so.0 && \
+     sudo ln -s $LIBRARY_PATH/libpistache.so.0 $LIBRARY_PATH/libpistache.so && \
+     sudo ldconfig
+
+echo "---> install-git-pistache.sh ends"

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 9f6ba64..3630cb0 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -116,14 +116,22 @@
     jobs:
       - '{project-name}-gerrit-release-jobs'
 
+- project:
+    <<: *ves_docker_common
+    name: smo-ves-nexus-iq
+    build-node: centos7-builder-1c-1g
+    nexus-iq-namespace: oran-
+    jobs:
+      - gerrit-tox-nexus-iq-clm
+
 - project:
     <<: *ves_docker_common
     name: smo-ves-sonarqube
     python-version: python3
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
-    pre-build-script: !include-raw-escape:
-      - ../shell/install-deb-rmr.sh
+    #pre-build-script: !include-raw-escape:
+    #  - ../shell/install-deb-rmr.sh
     # impt for verify and tox etc
     tox-envs: code,flake8
     sonar-project-file: ""
@@ -136,4 +144,4 @@
       sonar.sources=collector
       sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-tox-sonarqube
+      - gerrit-tox-sonar