Changes between Version 13 and Version 14 of ReleaseProcedure


Ignore:
Timestamp:
Aug 20, 2007, 3:22:48 PM (15 years ago)
Author:
Jari Häkkinen
Comment:

More fixes to the release procedures.

Legend:

Unmodified
Added
Removed
Modified
  • ReleaseProcedure

    v13 v14  
    2424Manager. Of course, one team member can be both managers, thus
    2525becoming the Release and Merge Manager.
     26
     27Currently, Jari Hakkinen is the Release Manager and Johan Enell is the
     28Merge Master.
    2629
    2730
     
    108111    released; make sure that all the tests pass, test the distribution
    109112    package, and perform all other release tests you think is
    110     appropriate:
     113    appropriate. ''If you fail in this step, please resolve the issues and restart these procedures.''
    111114  i. Create an empty test database
    112115  i. Setup 'base.config' for the tests.
     
    118121}}}
    119122    The `-s` option above will generate less output from the test
    120     program.
    121  If you fail in this step, please resolve the issues and restart these procedures. [[br]][[br]]
     123    program. [[br]][[br]]
    122124 1. Create a tag using a one liner like
    123125{{{
     
    165167  i. In section '''BASE ''devel'' ''' update link to `[milestone:A.B+1 A.B+1]`.[[br]][[br]]
    166168  i. Add a ''Base A.B'' subsection in the '''All packaged BASE releases''' section. [[br]][[br]]
    167  1. Close the [http://trac.thep.lu.se/trac/base/roadmap milestone]
     169 1. If required, merge the patch release into the trunk. To avoid
     170    confusion and minimize the risk of loosing fixes, this step is
     171    only performed by the Merge Master. [[br]][[br]]
     172  i. Checkout a pristine version of the trunk.
     173{{{
     174svn checkout http://lev.thep.lu.se/repository/base/trunk trunk_merge
     175}}}
     176  i. Merge changes into trunk. In this example the difference between
     177     minor branch at forking time and the minor release tag is merged
     178     into the trunk WC
     179{{{
     180cd trunk_merge
     181svn merge http://lev.thep.lu.se/repository/base/brances/A.B-stable@fork_revision \
     182          http://lev.thep.lu.se/repository/base/tags/A.B
     183}}}
     184  i. Resolve all conflicts. Run tests and perform all other
     185     appropriate tests to make sure that the merge does not create
     186     havoc. (run !TestAll and perform an installation.) [[br]][[br]]
     187  i. Commit changes to the trunk branch.
     188{{{
     189svn commit -m "Merged pre-A.B-releases to the trunk. Delta A.B - A.B@fork_revision"
     190}}}
     191 1.  ''Performing this step is to acknowledge that the merge has been performed.'' [[br]]
     192    Close the [http://trac.thep.lu.se/trac/base/roadmap milestone]
    168193    associated with the release and replace `head` with appropriate revision. Add a new milestone as
    169194    needed (with an associated log link like ''Revision Log: log:branches/webservices@3001:head'' in the
     
    176201This section describes what to do when publishing a patch release A.B.C.
    177202
    178  1. Make sure that all commits are performed into to the trunk, such
     203 1. Make sure that all commits are performed into to the branch, such
    179204    as bumping version number(s) ([source:trunk/build.xml build.xml]),
    180205    acknowledge contributions ([source:trunk/credits.txt credits.txt]),
     
    208233    released; make sure that all the tests pass, test the distribution
    209234    package, and perform all other release tests you think is
    210     appropriate:
    211 {{{
    212 Please add test command sequence here
    213 }}}
    214     If you fail in this step, please resolve the issues and restart these procedures. [[br]][[br]]
     235    appropriate. ''If you fail in this step, please resolve the issues and restart these procedures.''
     236  i. Create an empty test database
     237  i. Setup 'base.config' for the tests.
     238  i. Perform the following sequence of commands
     239{{{
     240ant test
     241cd build/test
     242./run.sh TestAll -s
     243}}}
     244    The `-s` option above will generate less output from the test
     245    program. [[br]][[br]]
    215246 1. Create a tag using a one liner like
    216247{{{
     
    253284 1. Merge the patch release into the trunk. To avoid confusion and
    254285    minimize the risk of loosing fixes, this step is only performed by
    255     the Merge Master. (Johan Enell is currently Merge Master and as the master
    256     he knows what he is doing.) [[br]][[br]]
     286    the Merge Master. [[br]][[br]]
    257287  i. Checkout a pristine version of the trunk.
    258288{{{
     
    277307    Close the milestone associated with the release and replace `head` with appropriate
    278308    revision in log link. Add a new milestone as needed (with an associated log link like
    279     ''Revision Log: log:branches/webservices@3001:head'' in the description field).
     309    ''Revision Log: log:branches/webservices@3001:head'' in the description field). [[br]][[br]]
     310 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.