Add a script to tag a release

[docs.git] / docs / release-process / branch-cutting.rst

diff --git a/docs/release-process/branch-cutting.rst b/docs/release-process/branch-cutting.rst
index be0457948a17bd6c8611c6d8fc44bcf5832395c1..70da8781ad1b3256c642cc9a9444d981efe58e1c 100644 (file)
--- a/docs/release-process/branch-cutting.rst
+++ b/docs/release-process/branch-cutting.rst
@@ -3,11 +3,8 @@ Branch Cutting
 **************
 
 This page documents the current branch cutting tasks that are needed
-to be performed at various milestones and which team has the necessary
-permissions in order to perform the necessary task in Parentheses.
-
-M5 Offset 2
-===========
+to be performed at RC0 and which team has the necessary permissions
+in order to perform the necessary task in Parentheses.
 
 JJB (releng/builder)
 --------------------
@@ -17,10 +14,10 @@ JJB (releng/builder)
 
    .. code-block:: bash
 
-      export NEXT_RELEASE="Nitrogen"
-      export CURR_RELEASE="Carbon"
+      export NEXT_RELEASE="Neon"
+      export CURR_RELEASE="Fluorine"
 
-#. Change JJB yaml files from `stream:carbon` branch pointer from `master -> stable/${CURR_RELEASE,,}`
+#. Change JJB yaml files from `stream:fluorine` branch pointer from `master -> stable/${CURR_RELEASE,,}`
    and create new `stream: ${NEXT_RELEASE,,}` branch pointer to branch master. This
    requires handling two different file formats interspersed with in autorelease projects.
    **(releng/builder committers)**
@@ -28,18 +25,18 @@ JJB (releng/builder)
    .. code-block:: yaml
 
       stream:
-        - Nitrogen:
+        - Neon:
             branch: master
-        - Carbon:
-            branch: stable/carbon
+        - Fluorine:
+            branch: stable/fluorine
 
    .. code-block:: yaml
 
       - project:
-          name: aaa-carbon
+          name: aaa-neon
           jobs:
             - '{project-name}-verify-{stream}-{maven}-{jdks}'
-          stream: nitrogen
+          stream: neon
           branch: master
 
    - The above manual process of updating individual files is automated with the script.
@@ -73,7 +70,7 @@ Autorelease
 
       Enable Exclusive checkbox override any existing permissions.
 
-#.  Start the branch cut job or use the manual steps below for branch cutting autorelease. **(Release Engineering Team)**
+#. Start the branch cut job or use the manual steps below for branch cutting autorelease. **(Release Engineering Team)**
 #. Start the version bump job or use the manual steps below for version bump autorelease. **(Release Engineering Team)**
 #. Merge all .gitreview patches submitted though the job or manually. **(Release Engineering Team)**
 #. Remove create reference permissions set on gerrit for RE's. **(Helpdesk)**
@@ -173,3 +170,12 @@ Manual steps to version bump (Autorelease)
 
        git submodule foreach 'git commit -asm "Bump versions by x.(y+1).z for next dev cycle"'
        git submodule foreach 'git review -t ${CURR_RELEASE,,}-branch-cut'
+
+#. Merge the patches in order according to the merge-order.log file found
+   in autorelease jobs. **(Release Engineering Team)**
+
+   .. note::
+
+      The version bump patches can be merged more quickly by performing a local
+      build with ``mvn clean deploy -DskipTests`` to prime Nexus with the new
+      version updates.