VOL-4964 - Update the core contributors list.
overview/contributing.rst
-------------------------
o Removed some, added some
Change-Id: I50544101c9ca8f10bb5e2ccddba57437ae3d20ad
diff --git a/VERSION b/VERSION
index e249ffa..20e4310 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12.0-dev1
+2.12.0-dev2
diff --git a/howto/release/voltctl/release.rst b/howto/release/voltctl/release.rst
index a23abf3..1c37ed6 100644
--- a/howto/release/voltctl/release.rst
+++ b/howto/release/voltctl/release.rst
@@ -18,7 +18,7 @@
- Verify the `package(v1.8.0) <https://github.com/opencord/voltctl/releases/tag/v1.8.0>`_ contains more than just source archives (gz, zip):
- The `tags page <https://github.com/opencord/voltctl/tags>`_ index lacks ``Notes`` and ``Downloads`` links.
- - A valid `package(v1.7.6) <https://github.com/opencord/voltctl/releases/tag/v1.7.6>`_ will include:
+ - A valid package(v1.7.6) _ will include:
- The `tags page <https://github.com/opencord/voltctl/tags>`_ index contains ``Notes`` and ``Downloads`` links.
- A checksum file
diff --git a/makefiles/lint/doc8/excl.mk b/makefiles/lint/doc8/excl.mk
new file mode 100644
index 0000000..efa71da
--- /dev/null
+++ b/makefiles/lint/doc8/excl.mk
@@ -0,0 +1,48 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2017-2022 Open Networking Foundation
+#
+# 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.
+# -----------------------------------------------------------------------
+
+$(if $(DEBUG),$(warning ENTER))
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+
+## excl := $(wildcar */*/.git)
+lint-doc8-excl-raw += '$(venv-name)'
+lint-doc8-excl-raw += '*/$(venv-name)'
+$(if $(BUILDDIR),\
+ $(excl lint-doc8-excl-raw += '$(BUILDDIR)'))
+
+# YUCK! -- overhead
+# o Submodule(s) use individual/variant virtualenv install paths.
+# o Exclude special snowflakes to enable library makefile use.
+# o All can use virtualenv.mk for consistent names and cleanup
+# o [TODO] Ignore submodules, individual repos should check their sources.
+
+lint-doc8-excl-raw += '*/venv_cord'
+lint-doc8-excl-raw += '*/vst_venv'
+
+lint-doc8-excl-raw += './cord-tester'
+lint-doc8-excl-raw += './repos/cord-tester'
+
+lint-doc8-excl-raw += './bbsim/internal/bbsim/responders/sadis/dp.txt'
+lint-doc8-excl-raw += './repos/bbsim/internal/bbsim/responders/sadis/dp.txt'
+lint-doc8-excl-raw += './repos/voltha-helm-charts/voltha-infra/templates/NOTES.txt'
+lint-doc8-excl-raw += './voltha-helm-charts/voltha-infra/templates/NOTES.txt'
+
+$(if $(DEBUG),$(warning LEAVE))
+
+# [EOF]
diff --git a/makefiles/lint/doc8.mk b/makefiles/lint/doc8/include.mk
similarity index 72%
rename from makefiles/lint/doc8.mk
rename to makefiles/lint/doc8/include.mk
index e0594df..5e8abd7 100644
--- a/makefiles/lint/doc8.mk
+++ b/makefiles/lint/doc8/include.mk
@@ -36,24 +36,8 @@
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
-lint-doc8-excl += --ignore-path '$(venv-name)'
-lint-doc8-excl += --ignore-path '$(BUILDDIR)'
-
-# YUCK! -- overhead
-# o Submodule(s) use individual/variant virtualenv install paths.
-# o Exclude special snowflakes to enable library makefile use.
-# o [TODO] Use makefiles/virtualenv.mk to avoid duplication.
-
-lint-doc8-excl += --ignore-path '*/venv_cord'
-lint-doc8-excl += --ignore-path '*/vst_venv'
-
-lint-doc8-excl += --ignore-path './cord-tester'
-lint-doc8-excl += --ignore-path './repos/cord-tester'
-
-lint-doc8-excl += --ignore-path './bbsim/internal/bbsim/responders/sadis/dp.txt'
-lint-doc8-excl += --ignore-path './repos/bbsim/internal/bbsim/responders/sadis/dp.txt'
-lint-doc8-excl += --ignore-path './repos/voltha-helm-charts/voltha-infra/templates/NOTES.txt'
-lint-doc8-excl += --ignore-path './voltha-helm-charts/voltha-infra/templates/NOTES.txt'
+include $(MAKEDIR)/lint/doc8/excl.mk
+lint-doc8-excl := $(addprefix --ignore-path$(space),$(lint-doc8-excl-raw))
lint-doc8-args += --max-line-length 120
diff --git a/makefiles/lint/include.mk b/makefiles/lint/include.mk
index 96f6bce..25d12e9 100644
--- a/makefiles/lint/include.mk
+++ b/makefiles/lint/include.mk
@@ -15,6 +15,8 @@
# limitations under the License.
# -----------------------------------------------------------------------
+$(if $(DEBUG),$(warning ENTER))
+
# -----------------------------------------------------------------------
# Intent: Display help banner early before library lint help targets.
# -----------------------------------------------------------------------
@@ -35,11 +37,13 @@
##--------------------##
##---] INCLUDES [---##
##--------------------##
-include $(MAKEDIR)/lint/doc8.mk
+include $(MAKEDIR)/lint/doc8/include.mk
include $(MAKEDIR)/lint/json.mk
include $(MAKEDIR)/lint/python/include.mk
include $(MAKEDIR)/lint/robot.mk
include $(MAKEDIR)/lint/shell.mk
include $(MAKEDIR)/lint/yaml.mk
+$(if $(DEBUG),$(warning LEAVE))
+
# [EOF]
diff --git a/makefiles/targets/tox.mk b/makefiles/targets/tox.mk
new file mode 100644
index 0000000..5942774
--- /dev/null
+++ b/makefiles/targets/tox.mk
@@ -0,0 +1,41 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# 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-FileCopyrightText: 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+
+$(if $(DEBUG),$(warning ENTER))
+
+## -----------------------------------------------------------------------
+## Intent: Sanity check incoming JJB config changes.
+## Todo: Depend on makefiles/lint/jjb.mk :: lint-jjb
+## -----------------------------------------------------------------------
+# lint : lint-jjb
+lint-tox: lint-jjb
+ tox -e py310 --workers=auto
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+help-verbose += help-tox
+help-tox ::
+ @echo
+ @echo '[MAKE: tox]'
+ @echo ' lint-tox Python unit testing, sanity check incoming JJB changes.'
+
+$(if $(DEBUG),$(warning LEAVE))
+
+# [EOF]
diff --git a/overview/contributing.rst b/overview/contributing.rst
index 22f492a..479e58f 100644
--- a/overview/contributing.rst
+++ b/overview/contributing.rst
@@ -203,7 +203,6 @@
- `Thiyagarajan Subramani <Thiyagarajan.Subramani@radisys.com>`_
- `Burak Gurdag <burak.gurdag@netsia.com>`_
- - `Girish Gowdra <girish.gowdra@intel.com>`_
ONOS apps:
@@ -215,7 +214,6 @@
- `Abhilash Satish Laxmeshwar <abhilash.laxmeshwar@radisys.com>`_
- `Gamze Abaka <gamze.abaka@netsia.com>`_
- - `Girish Gowdra <girish.gowdra@intel.com>`_
Build system, makefiles, reviews:
@@ -224,16 +222,11 @@
All of the codebase:
- - `Andrea Campanella`
- - `Matteo Scandolo`
- - `Hardik Windlass`
- - `Suchitra Vemuri`
- - `Saurav Das`
- `Mahir Gunyel <mahir.gunyel@netsia.com>`_
- `Serkant Uluderya <serkant.uluderya@netsia.com>`_
- `Amit Ghosh <Amit.Ghosh@radisys.com>`_
- - `Khenaidoo Nursimulu <knursimu@ciena.com>`_
- - `David Bainbridge <dbainbri.ciena@gmail.com>`_
+ - `Holger Hildebrandt <holger.hildebrandt@adtran.com>`_
+ - `Suhas Gururaj Rao <suhas.gururaj@radisys.com>`_
Community Guidelines
--------------------
diff --git a/overview/lab_setup.rst b/overview/lab_setup.rst
index 47e8921..177143e 100644
--- a/overview/lab_setup.rst
+++ b/overview/lab_setup.rst
@@ -182,10 +182,10 @@
To setup a NAT router on an Ubuntu 16.04 server you can look at this
tutorial:
-http://nairabytes.net/linux/how-to-set-up-a-nat-router-on-ubuntu-server-16-04
+http :// nairabytes.net/linux/how-to-set-up-a-nat-router-on-ubuntu-server-16-04
To install a DHCP server you can follow this tutorial:
-http://nairabytes.net/linux/how-to-install-a-dhcp-server-in-ubuntu-server-16-04
+http :// nairabytes.net/linux/how-to-install-a-dhcp-server-in-ubuntu-server-16-04
Once the ``DHCP`` server is installed, you need to configure it.
diff --git a/release_notes/voltha_2.11.rst b/release_notes/voltha_2.11.rst
index 2ad120c..2a02ec5 100644
--- a/release_notes/voltha_2.11.rst
+++ b/release_notes/voltha_2.11.rst
@@ -307,7 +307,7 @@
-
* - `voltha-go <https://gerrit.opencord.org/gitweb?p=voltha-go.git;a=tree>`_
- ``3.1.8``
- - `docker <https://jenkins.opencord.org/job/docker-publish_voltha-go/464/console>`__
+ - docker
- ``2.11.3``
- `X <https://gerrit.opencord.org/plugins/gitiles/voltha-go/+/refs/tags/v3.1.8>`__
- `X <https://github.com/opencord/voltha-go/tree/v3.1.8>`__