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 f29f45ea9039119d06da0d66ab0267762a5c37e0..d869ebeaf08978fac97c2691bf4af544ba16a562 100644 (file)
--- a/docs/release-process/simultaneous-release.rst
+++ b/docs/release-process/simultaneous-release.rst
@@ -8,13 +8,15 @@ approved a release.
 Preparations
 ============
 
-After release candidate is built gpg sign artifacts using odlsign-bulk script in
-**releng/builder/scripts**.
+After release candidate is built gpg sign artifacts using the
+`lftools sign <https://lf-releng-tools.readthedocs.io/en/latest/commands/sign.html>`_
+command.
 
 .. code-block:: bash
 
-    cd scripts/
-    ./odlsign-bulk STAGING_REPO_ID  # eg. autorelease-1367
+    STAGING_REPO=autorelease-1903
+    STAGING_PROFILE_ID=abc123def456  # This Profile ID is listed in Nexus > Staging Profiles
+    lftools sign deploy-nexus https://nexus.opendaylight.org $STAGING_REPO $STAGING_PROFILE_ID
 
 Verify the distribution-karaf file with the signature.
 
@@ -51,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)**
@@ -73,10 +88,8 @@ 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}/archives/patches.tar.gz"
+      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"
 
 - Run autorelease-version-bump-${STREAM} job
@@ -101,18 +114,18 @@ Releasing OpenDaylight
 - Run autorelease-generate-release-notes-${STREAM} job
   **(Release Engineering Team)**
 
-  This job is run a the end of every autorelease build can be used only for
-  service releases (SR). The release notes file (release_notes.rst) is available
-  under archives. For major releases (Nitrogen, Carbon) the docs repository has
-  to branched and published which is only done after release reviews are
-  completed.
+  Trigger this job by leaving a Gerrit comment `generate-release-notes Carbon-SR2`
+
+  .. important:: This job can only be used to generate service releases.
+
+  For major releases the notes come from the projects themselves in the docs
+  repo via the `docs/releaset-notes/projects` directory.
 
-  Release notes can also be manually generated with the script.
+  Release notes can also be manually generated with the script:
 
   .. code-block:: bash
 
       git checkout stable/${BRANCH,,}
-      cd scripts/release_notes_management/ && ./build.sh
+      ./scripts/release-notes-generator.sh ${RELEASE}
 
-  The output file (release_notes.rst) generated by the build script is available
-  under autorelease/scripts/release_notes_management/projects/.
+  A `release-notes.rst` will be generated in the working directory.