Simplify the SM release process

Change-Id: Id6eea746f2cc8f2fd06c928fcd9a9da8c7989b68
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
(cherry picked from commit ff3f69353448ff1b443794da8ecfefe674eb1777)

diff --git a/docs/release-process/managed-release.rst b/docs/release-process/managed-release.rst
index ef98e00f51ff71378c08917accb75948a0407610..ef505ab0a87b224561e6b4d04132318e476ec1f1 100644 (file)
--- a/docs/release-process/managed-release.rst
+++ b/docs/release-process/managed-release.rst
@@ -532,8 +532,9 @@ In general there are two types of Self-Managed (SM) projects:
    requirements and release process for these projects.
 
 #. Self-Managed projects that want to manage their own release schedule
-   or provide their release distribution and installation instructions.
-   There are no specific requirements for these projects.
+   or provide their release distribution and installation instructions
+   by the time of the release. There are no specific requirements for
+   these projects.
 
 Requirements for SM projects participating in the release distribution
 ----------------------------------------------------------------------
@@ -555,8 +556,8 @@ service release (e.g. by the major release date if they want to be in SR1).
           other important changes during the release cycle. After the formal release,
           the release notes also include this information.
 
-Add to Final Distribution
-+++++++++++++++++++++++++
+Add to Common Distribution
+++++++++++++++++++++++++++
 
 In order to be included in the formal (major or service) release distribution,
 Self-Managed Projects must be in the common distribution pom.xml file and the
@@ -570,27 +571,32 @@ using upstream SNAPSHOTs. See `Use of SNAPSHOT versions`_.
           high chances for missing the formal release distribution. See
           `Release the project artifacts`_.
 
-Release the project artifacts
-+++++++++++++++++++++++++++++
+Cut Stable Branch
++++++++++++++++++
 
-Self-Managed Projects wanting to participate in a formal (major or service) release,
-must perform the following tasks in the week after the Managed release is published
-to nexus:
+Self-Managed projects wanting to use the existing release job to release their
+artifacts (see `Release the project artifacts`_) must have an stable branch in
+the major release (fluorine, neon, etc) they are targeting. It is highly recommended
+to cut the stable branch before the first Managed release candidate (RC) is created.
 
-#. Bump their upstream version to latest Managed release.
-#. Release the project and publish the artifacts to nexus.
+.. note:: Do not forget to update your jenkins jobs once the stable branch is
+          created. If you do not know how to do this please open a ticket
+          to opendaylight helpdesk.
 
-   SM projects relaying on latest Managed projects SNAPSHOT can use the release job
-   for the 2 actions above. See more information about the release job in
-   :doc:`project-release`.
+Release the project artifacts
++++++++++++++++++++++++++++++
 
-   .. note:: The release job can be triggered from any project patch by just leaving
-      a comment containing "build release".
+Self-Managed projects wanting to participate in the formal (major or service) release
+distribution must release and publish their artifacts to nexus in the week after the
+Managed release is published to nexus.
 
-#. Add their release artifact to the common distribution.
+Self-Managed projects having an stable branch with latest upstream SNAPSHOT (see
+previous requirements) can use the release job in :doc:`project-release` to release
+their artifacts.
 
-   If not done yet, SM projects can add their artifacts to the common distribution
-   by following this guide :ref:`add-proj-dist`
+.. note:: The release job can be triggered from any project patch in the intended
+          release (fluorine, neon, etc) by just leaving a comment containing "build
+          release".
 
 .. note:: Self-Managed Projects will not have any leeway for missing deadlines. If
           projects are not in the final distribution in the allocated time (normally