Merge "Roll versions, Trigger docs, Rebase j-release branch (J-Releas…

…e)" into j-release
o-ran-sc · Jun 28, 2024 · 90aa7a2 · 90aa7a2
2 parents b2e0b45 + 4220dcd
commit 90aa7a2
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 23 deletions.
diff --git a/.releases/maven-release--nonrtric-plt-participant-impl-dme.yaml b/.releases/maven-release--nonrtric-plt-participant-impl-dme.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: maven
+version: 0.1.0
+project: nonrtric-plt-participant-impl-dme
+log_dir: nonrtric-plt-participants-maven-stage-master/8/
diff --git a/.releases/maven-release-nonrtric-plt-rappmanager.yaml b/.releases/maven-release-nonrtric-plt-rappmanager.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: maven
+version: 0.1.0
+project: nonrtric-plt-rappmanager
+log_dir: nonrtric-plt-rappmanager-maven-stage-master/12/
diff --git a/docs/conf.py b/docs/conf.py
@@ -18,8 +18,8 @@
 
 #branch configuration
 
-branch = 'latest'
-baseurl = 'https://docs.o-ran-sc.org/projects/'
+branch = 'j-release'
+baseurl = 'https://docs.o-ran-sc.org/projects'
 selfurl = '%s/o-ran-sc-nonrtric-plt-rappmanager/en/%s' %(baseurl, branch)
 
 linkcheck_ignore = [
@@ -46,5 +46,5 @@
 intersphinx_mapping = {}
 
 intersphinx_mapping['nonrtric'] = ('%s/o-ran-sc-nonrtric/en/%s' %(baseurl, branch), None)
-intersphinx_mapping['participants'] = ('%s/participants' % selfurl, None)
+#intersphinx_mapping['participants'] = ('%s/participants' % selfurl, None)
 intersphinx_disabled_reftypes = ["*"]
diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
@@ -61,9 +61,9 @@ Non-RT RIC can be also deployed in a Kubernetes cluster, `it/dep repository <htt
 hosts deployment and integration artifacts. Instructions and helm charts to deploy the Non-RT-RIC functions in the
 OSC NONRTRIC integrated test environment can be found in the *./nonrtric* directory.
 
-The scripts located in *rappmanager/scripts/install* can be used for an automatic installation in the Kubernetes Cluster, see `Automatic Installation in Kubernetes <https://docs.o-ran-sc.org/projects/o-ran-sc-nonrtric-plt-rappmanager/en/latest/installation-guide.html>`_.
+The scripts located in *rappmanager/scripts/install* can be used for an automatic installation in the Kubernetes Cluster, see `Automatic Installation in Kubernetes <https://docs.o-ran-sc.org/projects/o-ran-sc-nonrtric-plt-rappmanager/en/j-release/installation-guide.html>`_.
 
-For more information on installation of NonRT-RIC in Kubernetes, see `Deploy NONRTRIC in Kubernetes <https://wiki.o-ran-sc.org/display/RICNR/Release+I+-+Run+in+Kubernetes>`_.
+For more information on installation of NonRT-RIC in Kubernetes, see `Deploy NONRTRIC in Kubernetes <https://wiki.o-ran-sc.org/display/RICNR/Release+J+-+Run+in+Kubernetes>`_.
 
 For more information see `Integration and Testing documentation in the O-RAN-SC <https://docs.o-ran-sc.org/projects/o-ran-sc-it-dep/en/latest/index.html>`_.
 
diff --git a/docs/overview.rst b/docs/overview.rst
@@ -45,7 +45,6 @@ List of participants used by rApp manager sample rApp.
 * `A1PMS Participant <https://docs.onap.org/projects/onap-policy-parent/en/latest/clamp/acm/design-impl/participants/a1pms-participant.html>`_ - It interacts with A1PMS of NONRTRIC. It is capable of lifecycle managing A1PMS service.
 * `Kserve Participant <https://docs.onap.org/projects/onap-policy-parent/en/latest/clamp/acm/design-impl/participants/kserve-participant.html>`_ - It interacts with Kserve. It is capable of lifecycle managing Kserve inference service.
 * `Kubernetes Participant <https://docs.onap.org/projects/onap-policy-parent/en/latest/clamp/acm/design-impl/participants/k8s-participant.html>`_ - It interacts with Helm/Kubernetes. It is capable of lifecycle managing Helm charts. It expects the helm charts to be available in the mentioned repository as it doesn't handle the helm chart creation in the chart repository.
-* :doc:`DME Participant <participants:index>` -  It interacts with DME(ICS) of NONRTRIC. It is capable of lifecycle managing DME entities.
 
 ACM composition and instance details can be provided as part of the rApp package and the package structure can be found in `Sample rApp package structure`_.
 

diff --git a/participants/docs/conf.py b/participants/docs/conf.py
@@ -18,7 +18,7 @@
 
 #branch configuration
 
-branch = 'latest'
+branch = 'j-release'
 
 linkcheck_ignore = [
     'http://localhost.*',

diff --git a/participants/participant-impl-dme/pom.xml b/participants/participant-impl-dme/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>participants</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.participants</groupId>

diff --git a/participants/pom.xml b/participants/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
     <artifactId>participants</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>NONRTRIC ACM Participants</name>
     <description>O-RAN SC ACM Participants.</description>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
     <artifactId>rappmanager</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>NONRTRIC rAppmanager</name>
     <description>O-RAN SC rApp Management function.</description>

diff --git a/rapp-manager-acm/pom.xml b/rapp-manager-acm/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-application/pom.xml b/rapp-manager-application/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-dme/pom.xml b/rapp-manager-dme/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-models/pom.xml b/rapp-manager-models/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/rapp-manager-sme/pom.xml b/rapp-manager-sme/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.o-ran-sc.nonrtric.plt</groupId>
         <artifactId>rappmanager</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>

diff --git a/tox.ini b/tox.ini
@@ -36,11 +36,11 @@ commands =
 
 allowlist_externals = echo
 
-[testenv:docs-linkcheck]
-basepython = python3
-deps =
-    -r{toxinidir}/docs/requirements-docs.txt
-    -r{toxinidir}/participants/docs/requirements-docs.txt
-commands =
-    sphinx-build -W -b linkcheck -d {envtmpdir}/participants/doctrees ./participants/docs/ {toxinidir}/docs/_build/linkcheck/participants
-    sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
+#[testenv:docs-linkcheck]
+#basepython = python3
+#deps =
+#    -r{toxinidir}/docs/requirements-docs.txt
+#    -r{toxinidir}/participants/docs/requirements-docs.txt
+#commands =
+#    sphinx-build -W -b linkcheck -d {envtmpdir}/participants/doctrees ./participants/docs/ {toxinidir}/docs/_build/linkcheck/participants
+#    sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck