fix branch in docs config files

Issue-ID: DOC-811

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

diff --git a/.gitreview b/.gitreview
index 574906d..0de82b6 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@
         host=gerrit.onap.org
         port=29418
         project=cps/cps-temporal
-        defaultbranch=master
+        defaultbranch=london
         
\ No newline at end of file

diff --git a/docs/conf.py b/docs/conf.py
index c3161ec..7db4a23 100755 (executable)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -20,8 +20,8 @@
 from docutils.parsers.rst import directives
 
 project = "onap"
-release = "master"
-version = "master"
+release = "london"
+version = "london"
 
 author = "Open Network Automation Platform"
 # yamllint disable-line rule:line-length
@@ -45,7 +45,7 @@ extensions = [
 # Map to 'latest' if this file is used in 'latest' (master) 'doc' branch.
 # Change to {releasename} after you have created the new 'doc' branch.
 #
-branch = 'latest'
+branch = 'london'
 doc_url = 'https://docs.onap.org/projects'
 master_doc = 'index'
 

diff --git a/docs/conf.yaml b/docs/conf.yaml
deleted file mode 100644 (file)
index 8669911..0000000
--- a/docs/conf.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 Bell Canada
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
----
-project_cfg: onap
-project: onap
-
-# Change this to ReleaseBranchName to modify the header
-default-version: latest

diff --git a/docs/tox.ini b/docs/tox.ini
index dc46706..cb87906 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -25,7 +25,7 @@ basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
     -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
-    -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=london
 commands =
     sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
 [testenv:docs-linkcheck]
@@ -33,7 +33,7 @@ basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
     -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
-    -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=london
 commands =
     sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
 [testenv:docs-spellcheck]
@@ -41,6 +41,6 @@ basepython = python3.8
 deps =
     -r{toxinidir}/requirements-docs.txt
     -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
-    -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=london
 commands =
     sphinx-build -W -q -b spelling -Dextensions=sphinxcontrib.spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck