docs config for oslo release

Issue-ID: DOC-826

Change-Id: Ib7c8b5376d126d4edc9520665050173c4ac60666
Signed-off-by: thmsdt <thomas.kulik@telekom.de>

diff --git a/.gitreview b/.gitreview
index 4760964..2970a73 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.onap.org
 port=29418
 project=integration.git
-defaultbranch=master
+defaultbranch=oslo

diff --git a/docs/conf.py b/docs/conf.py
index 322b9c0..c1d4cdf 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 project = "onap"
-release = "master"
-version = "master"
+release = "oslo"
+version = "oslo"
 
 author = "Open Network Automation Platform"
 # yamllint disable-line rule:line-length
@@ -30,7 +30,7 @@ extensions = [
 # Change to {releasename} after you have created the new 'doc' branch.
 #
 
-branch = 'latest'
+branch = 'oslo'
 
 intersphinx_mapping = {}
 doc_url = 'https://docs.onap.org/projects'
@@ -47,26 +47,10 @@ spelling_lang = "en_GB"
 #
 intersphinx_mapping = {}
 intersphinx_mapping['onap-oom'] = ('{}/onap-oom/en/%s'.format(doc_url) % branch, None)
-intersphinx_mapping['onap-cli'] = ('{}/onap-cli/en/%s'.format(doc_url) % branch, None)
 
 html_last_updated_fmt = '%d-%b-%y %H:%M'
 
 def setup(app):
     app.add_css_file("css/ribbon.css")
 
-linkcheck_ignore = [
-  r'http://localhost:\d+/'
-  r'http://localhost:.*',
-  r'http://CONSUL_SERVER_UI:30270/ui/#/dc1/services',
-  r'https://.*h=frankfurt',
-  r'http.*frankfurt.*',
-  r'http.*simpledemo.onap.org.*',
-  r'http://ANY_K8S_IP.*',
-  r'http://so-monitoring:30224',
-  r'http://SINK_IP_ADDRESS:667.*',
-  r'http.*K8S_HOST:30227.*',
-  r'http.*K8S_NODE_IP.*',
-  r'http.*REPO_IP.*',
-  r'http://team.onap.eu',
-  r'https://tools.ietf.org/html/rfc8345'
-]
+linkcheck_ignore = ['.*']

diff --git a/docs/docs_NFV_Testing_Automatic_Platform_Requirements_User_Guide.rst b/docs/docs_NFV_Testing_Automatic_Platform_Requirements_User_Guide.rst
index 65d0e41..7823887 100644 (file)
--- a/docs/docs_NFV_Testing_Automatic_Platform_Requirements_User_Guide.rst
+++ b/docs/docs_NFV_Testing_Automatic_Platform_Requirements_User_Guide.rst
@@ -117,13 +117,6 @@ VTP New features
    conformance tool in VTP, please refer `the guide <https://gerrit.onap.org/r/gitweb?p=vnfsdk/validation.git;a=blob;f=cnf-conformance/README.md;h=cda3dee762f4dd2873613341f60f6662880f006a;hb=refs/heads/master>`_
 5. New VTP API has been updated: see the `VTP API wiki page <https://wiki.onap.org/display/DW/VTP+REST+API+v1>`_
 
-CLI New features
-----------------
-
-1. Enabled auto discover and registration of products functionalities as commands
-2. Profile management commands are added
-3. For the VTP Command line usage, please refer :ref:`CLI User Guide <onap-cli:cli_user_guide>`
-
 Test Status and Plans
 =====================
 

diff --git a/docs/tox.ini b/docs/tox.ini
index 643da68..a8c633e 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -8,7 +8,7 @@ basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
     -chttps://releases.openstack.org/constraints/upper/yoga
-    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=oslo
 commands =
     sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
 
@@ -17,7 +17,7 @@ basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
     -chttps://releases.openstack.org/constraints/upper/yoga
-    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=oslo
 commands =
     sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
 
@@ -26,6 +26,6 @@ basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
     -chttps://releases.openstack.org/constraints/upper/yoga
-    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=oslo
 commands =
     sphinx-build -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck