Merge "M4 status Groupbasedpolicy"

[docs.git] / docs / release-process / simultaneous-release.rst

diff --git a/docs/release-process/simultaneous-release.rst b/docs/release-process/simultaneous-release.rst
index e243fd462aa14e7cbcec76dc68ffd98222946c90..d869ebeaf08978fac97c2691bf4af544ba16a562 100644 (file)
--- a/docs/release-process/simultaneous-release.rst
+++ b/docs/release-process/simultaneous-release.rst
@@ -53,11 +53,24 @@ Releasing OpenDaylight
 
   .. code-block:: bash
 
-      git clone --recursive https://git.opendaylight.org/gerrit/releng/autorelease
-      cd autorelease
-      git submodule update --init
-      git review -s
-      git submodule foreach 'git review -s'
+     export RELEASE=Nitrogen-SR1
+     export STREAM=${RELEASE//-*}
+     export BRANCH=origin/stable/${STREAM,,}
+
+     git clone --recursive https://git.opendaylight.org/gerrit/releng/autorelease
+     cd autorelease
+     git fetch origin
+
+     # Ensure we are on the right branch. Note that we are wiping out all
+     # modifications in the repo so backup unsaved changes before doing this.
+     git checkout -f
+     git checkout ${BRANCH,,}
+     git clean -xdff
+     git submodule update --init
+
+     # Ensure git review is setup
+     git review -s
+     git submodule foreach 'git review -s'
 
 - Make sure the latest lftools is installed
   **(Release Engineering Team)**
@@ -75,8 +88,6 @@ Releasing OpenDaylight
 
   .. code-block:: bash
 
-      export RELEASE=Beryllium-SR4
-      export STREAM=${RELEASE//-*}
       export BUILD_NUM=55
       export PATCH_URL="https://logs.opendaylight.org/releng/jenkins092/autorelease-release-${STREAM,,}/${BUILD_NUM}/patches.tar.gz"
       ./scripts/release-tags.sh "${RELEASE}" /tmp/patches "$PATCH_URL"
@@ -115,6 +126,6 @@ Releasing OpenDaylight
   .. code-block:: bash
 
       git checkout stable/${BRANCH,,}
-      ./scripts/release-notes-generator.sh Carbon-SR2
+      ./scripts/release-notes-generator.sh ${RELEASE}
 
   A `release-notes.rst` will be generated in the working directory.