Changes between Version 13 and Version 14 of ReleaseProcedure

Timestamp:

Aug 20, 2007, 3:22:48 PM (17 years ago)

Author:

Jari Häkkinen

Comment:

More fixes to the release procedures.

ReleaseProcedure

@@ -24 +24 @@
 Manager. Of course, one team member can be both managers, thus
 becoming the Release and Merge Manager.
+
+Currently, Jari Hakkinen is the Release Manager and Johan Enell is the
+Merge Master.
 
 
@@ -108 +111 @@
     released; make sure that all the tests pass, test the distribution
     package, and perform all other release tests you think is
-    appropriate:
+    appropriate. ''If you fail in this step, please resolve the issues and restart these procedures.''
   i. Create an empty test database
   i. Setup 'base.config' for the tests.
@@ -118 +121 @@
 }}}
     The `-s` option above will generate less output from the test
-    program.
- If you fail in this step, please resolve the issues and restart these procedures. [[br]][[br]]
+    program. [[br]][[br]]
  1. Create a tag using a one liner like
 {{{
@@ -165 +167 @@
   i. In section '''BASE ''devel'' ''' update link to `[milestone:A.B+1 A.B+1]`.[[br]][[br]]
   i. Add a ''Base A.B'' subsection in the '''All packaged BASE releases''' section. [[br]][[br]]
- 1. Close the [http://trac.thep.lu.se/trac/base/roadmap milestone]
+ 1. If required, merge the patch release into the trunk. To avoid
+    confusion and minimize the risk of loosing fixes, this step is
+    only performed by the Merge Master. [[br]][[br]]
+  i. Checkout a pristine version of the trunk.
+{{{
+svn checkout http://lev.thep.lu.se/repository/base/trunk trunk_merge
+}}}
+  i. Merge changes into trunk. In this example the difference between
+     minor branch at forking time and the minor release tag is merged
+     into the trunk WC
+{{{
+cd trunk_merge
+svn merge http://lev.thep.lu.se/repository/base/brances/A.B-stable@fork_revision \
+          http://lev.thep.lu.se/repository/base/tags/A.B
+}}}
+  i. Resolve all conflicts. Run tests and perform all other
+     appropriate tests to make sure that the merge does not create
+     havoc. (run !TestAll and perform an installation.) [[br]][[br]]
+  i. Commit changes to the trunk branch.
+{{{
+svn commit -m "Merged pre-A.B-releases to the trunk. Delta A.B - A.B@fork_revision"
+}}}
+ 1.  ''Performing this step is to acknowledge that the merge has been performed.'' [[br]]
+    Close the [http://trac.thep.lu.se/trac/base/roadmap milestone]
     associated with the release and replace `head` with appropriate revision. Add a new milestone as
     needed (with an associated log link like ''Revision Log: log:branches/webservices@3001:head'' in the
@@ -176 +201 @@
 This section describes what to do when publishing a patch release A.B.C.
 
- 1. Make sure that all commits are performed into to the trunk, such
+ 1. Make sure that all commits are performed into to the branch, such
     as bumping version number(s) ([source:trunk/build.xml build.xml]),
     acknowledge contributions ([source:trunk/credits.txt credits.txt]),
@@ -208 +233 @@
     released; make sure that all the tests pass, test the distribution
     package, and perform all other release tests you think is
-    appropriate:
-{{{
-Please add test command sequence here
-}}}
-    If you fail in this step, please resolve the issues and restart these procedures. [[br]][[br]]
+    appropriate. ''If you fail in this step, please resolve the issues and restart these procedures.''
+  i. Create an empty test database
+  i. Setup 'base.config' for the tests.
+  i. Perform the following sequence of commands
+{{{
+ant test
+cd build/test
+./run.sh TestAll -s
+}}}
+    The `-s` option above will generate less output from the test
+    program. [[br]][[br]]
  1. Create a tag using a one liner like
 {{{
@@ -253 +284 @@
  1. Merge the patch release into the trunk. To avoid confusion and
     minimize the risk of loosing fixes, this step is only performed by
-    the Merge Master. (Johan Enell is currently Merge Master and as the master
-    he knows what he is doing.) [[br]][[br]]
+    the Merge Master. [[br]][[br]]
   i. Checkout a pristine version of the trunk.
 {{{
@@ -277 +307 @@
     Close the milestone associated with the release and replace `head` with appropriate
     revision in log link. Add a new milestone as needed (with an associated log link like
-    ''Revision Log: log:branches/webservices@3001:head'' in the description field).
+    ''Revision Log: log:branches/webservices@3001:head'' in the description field). [[br]][[br]]
+ 1. [mailto:basedb-users@lists.sourceforge.net,basedb-devel@lists.sourceforge.net,basedb-announce@lists.sourceforge.net Announce] the new release in the mailing list.