Merge "Add instructions about branching"

1 files changed, 19 insertions, 0 deletions

diff --git a/docs/testing/developer/devguide/overview.rst b/docs/testing/developer/devguide/overview.rst
index 1d7e22fe..06a6914b 100644
--- a/docs/testing/developer/devguide/overview.rst
+++ b/docs/testing/developer/devguide/overview.rst
@@ -79,6 +79,20 @@ The test cases are written in `pytest`_. You may run it selectively with
 
     pytest tests/unit/reporter
 
+
+Branching
+=========
+
+Stable branches are created when features are frozen for next release. According to
+`OPNFV release milestone description`_, stable branch window is open on MS6 and closed on MS7.
+
+#. Contact gerrit admin <opnfv-helpdesk@rt.linuxfoundation.org> to create branch for project.
+#. Setup `qtip jobs`_ and `docker jobs`_ for stable branch in releng
+#. Follow `instructions for stable branch`_.
+
+NOTE: we do **NOT** create branches for feature development as in the popular `GitHub Flow`_
+
+
 .. _Connexion: https://pypi.python.org/pypi/connexion/
 .. _Click: http://click.pocoo.org/
 .. _Jinja2: http://jinja.pocoo.org/
@@ -87,3 +101,8 @@ The test cases are written in `pytest`_. You may run it selectively with
 .. _sphinx: http://www.sphinx-doc.org/en/stable/
 .. _The Hitchhiker's Guide to Python: http://python-guide-pt-br.readthedocs.io/en/latest/writing/structure/
 .. _tox: https://tox.readthedocs.io/
+.. _OPNFV release milestone description: https://wiki.opnfv.org/display/SWREL/Release+Milestone+Description
+.. _qtip jobs: https://git.opnfv.org/releng/tree/jjb/qtip/
+.. _docker jobs: https://git.opnfv.org/releng/tree/jjb/releng/opnfv-docker.yml
+.. _instructions for stable branch: https://wiki.opnfv.org/display/SWREL/Stablebranch
+.. _GitHub Flow: https://guides.github.com/introduction/flow/