From 4220dcd7009a8504a924af854fb7eda29cea1ba1 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Thu, 27 Jun 2024 12:04:28 +0100 Subject: [PATCH] Roll versions, Trigger docs, Rebase j-release branch (J-Release) Issue-ID: 972 Change-Id: I65f66a42fe0863bf4cca511ea45944ed03edcefa Signed-off-by: JohnKeeney --- docs/conf.py | 6 +++--- docs/developer-guide.rst | 4 ++-- docs/overview.rst | 1 - participants/docs/conf.py | 2 +- participants/participant-impl-dme/pom.xml | 2 +- participants/pom.xml | 2 +- pom.xml | 2 +- rapp-manager-acm/pom.xml | 2 +- rapp-manager-application/pom.xml | 2 +- rapp-manager-dme/pom.xml | 2 +- rapp-manager-models/pom.xml | 2 +- rapp-manager-sme/pom.xml | 2 +- tox.ini | 16 ++++++++-------- 13 files changed, 22 insertions(+), 23 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index ff4e306..0f0f5b3 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,8 +18,8 @@ from docs_conf.conf import * #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 @@ redoc_uri = 'https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js 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 index 0584ca1..0e2b826 100755 --- 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 `_. +The scripts located in *rappmanager/scripts/install* can be used for an automatic installation in the Kubernetes Cluster, see `Automatic Installation in Kubernetes `_. -For more information on installation of NonRT-RIC in Kubernetes, see `Deploy NONRTRIC in Kubernetes `_. +For more information on installation of NonRT-RIC in Kubernetes, see `Deploy NONRTRIC in Kubernetes `_. For more information see `Integration and Testing documentation in the O-RAN-SC `_. diff --git a/docs/overview.rst b/docs/overview.rst index 6bfb31f..486232b 100755 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -45,7 +45,6 @@ List of participants used by rApp manager sample rApp. * `A1PMS Participant `_ - It interacts with A1PMS of NONRTRIC. It is capable of lifecycle managing A1PMS service. * `Kserve Participant `_ - It interacts with Kserve. It is capable of lifecycle managing Kserve inference service. * `Kubernetes Participant `_ - 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 ` - 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 index fb77eb7..bf58054 100755 --- a/participants/docs/conf.py +++ b/participants/docs/conf.py @@ -18,7 +18,7 @@ from docs_conf.conf import * #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 index 7f2d8e5..aff2d02 100755 --- a/participants/participant-impl-dme/pom.xml +++ b/participants/participant-impl-dme/pom.xml @@ -26,7 +26,7 @@ org.o-ran-sc.nonrtric.plt participants - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT org.o-ran-sc.nonrtric.plt.participants diff --git a/participants/pom.xml b/participants/pom.xml index fbef851..08cb172 100755 --- a/participants/pom.xml +++ b/participants/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.plt participants - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT pom NONRTRIC ACM Participants O-RAN SC ACM Participants. diff --git a/pom.xml b/pom.xml index b952d57..1297ef5 100755 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.o-ran-sc.nonrtric.plt rappmanager - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT pom NONRTRIC rAppmanager O-RAN SC rApp Management function. diff --git a/rapp-manager-acm/pom.xml b/rapp-manager-acm/pom.xml index f23d691..5770413 100755 --- a/rapp-manager-acm/pom.xml +++ b/rapp-manager-acm/pom.xml @@ -26,7 +26,7 @@ org.o-ran-sc.nonrtric.plt rappmanager - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT org.o-ran-sc.nonrtric.plt.rappmanager diff --git a/rapp-manager-application/pom.xml b/rapp-manager-application/pom.xml index 5d32df5..cf1cd8e 100755 --- a/rapp-manager-application/pom.xml +++ b/rapp-manager-application/pom.xml @@ -25,7 +25,7 @@ org.o-ran-sc.nonrtric.plt rappmanager - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT org.o-ran-sc.nonrtric.plt.rappmanager diff --git a/rapp-manager-dme/pom.xml b/rapp-manager-dme/pom.xml index 9a8a0af..32f58ce 100755 --- a/rapp-manager-dme/pom.xml +++ b/rapp-manager-dme/pom.xml @@ -25,7 +25,7 @@ org.o-ran-sc.nonrtric.plt rappmanager - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT org.o-ran-sc.nonrtric.plt.rappmanager diff --git a/rapp-manager-models/pom.xml b/rapp-manager-models/pom.xml index bc5c010..11cc942 100755 --- a/rapp-manager-models/pom.xml +++ b/rapp-manager-models/pom.xml @@ -26,7 +26,7 @@ org.o-ran-sc.nonrtric.plt rappmanager - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT org.o-ran-sc.nonrtric.plt.rappmanager diff --git a/rapp-manager-sme/pom.xml b/rapp-manager-sme/pom.xml index dd877d2..9e84af8 100755 --- a/rapp-manager-sme/pom.xml +++ b/rapp-manager-sme/pom.xml @@ -26,7 +26,7 @@ org.o-ran-sc.nonrtric.plt rappmanager - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT org.o-ran-sc.nonrtric.plt.rappmanager diff --git a/tox.ini b/tox.ini index 1b63bfc..b211725 100755 --- 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 -- 2.16.6