Specific notes on updating oerBETA and OERca

From openmichigan

These are (hopefully) simplified notes on merging changes from the trunk of subversion onto the "production" branch of subversion. The web server instance known as oerBETA, which runs on bezak is used to test the changes before moving them onto the production server. After changes are verified on oerBETA, they are committed onto the "production" branch. This then makes them available to the production server instance known as OERca, which runs on the airway machine.

[edit] On bezak

1. Change to the directory where the "production" branch is checked out:

   $ cd /var/www/oerbeta
   

$ svn info Path: . URL: https://source.sakaiproject.org/contrib/ocw2/branches/version-1.0/tool Repository Root: https://source.sakaiproject.org/contrib Repository UUID: fdecad78-55fc-0310-b1b2-d7d25cf747c9 Revision: 54060 Node Kind: directory Schedule: normal Last Changed Author: kwc@umich.edu Last Changed Rev: 54060 Last Changed Date: 2008-10-17 09:15:37 -0400 (Fri, 17 Oct 2008)

$

1. Make sure you have the svnmerge script in your path, or use the full path name:

   $ which svnmerge.py
   

/usr/local/bin/svnmerge.py $

1. Check to see what is available for merging. Use the --log option to get context about the changes. Hopefully, all the subversion commits included the JIRA issue number.

   $ svnmerge.py --log avail
   

------------------------------------------------------------------------ r54062 | kwc@umich.edu | 2008-10-17 09:58:44 -0400 (Fri, 17 Oct 2008) | 5 lines Changed paths:

  M /ocw2/trunk/tool/system/application/views/default/common/header.php

OERDEV-206

Make sure the Home tab is activated for all the possible combinations of the home URL for an admin user.

------------------------------------------------------------------------ [ lots of output deleted ] $

1. Select specific revisions to merge into the "production" branch and then merge them:

   $ svnmerge.py merge -r 54062,54077,54192

(Alternatively, if all the available revisions are ready for merging:

$ svnmerge.py merge

Note: that the merge will populate a text file containing commit information about the revisions that are merged. This text will be used when we commit the changes onto the branch.)

1. Test the changes as appropriate for the changes that have been made
2. After all the changes are verified, commit the changes

   $ svn commit -F svnmerge-commit-message.txt

[edit] On airway

After the changes have been committed on the "production" branch, they are available to OERca

1. Use the fine VPN software http://vpn.umms.med.umich.edu to gain access to the airway machine.
2. After getting onto airway, change directories to the top of the OERca tool directory

   airway> cd /srv/www/open.umich.edu_website/oerca
   

airway> /usr/local/bin/svn info Path: . URL: https://source.sakaiproject.org/contrib/ocw2/branches/version-1.0/tool Repository Root: https://source.sakaiproject.org/contrib Repository UUID: fdecad78-55fc-0310-b1b2-d7d25cf747c9 Revision: 54060 Node Kind: directory Schedule: normal Last Changed Author: kwc@umich.edu Last Changed Rev: 54060 Last Changed Date: 2008-10-17 09:15:37 -0400 (Fri, 17 Oct 2008) airway>

1. Merge the changes

   airway> /usr/local/bin/svn up
   

1. Verify there were no conflicts with the update. (There shouldn't be any unless there were manual changes made to the OERca code on airway!)

Congratulations! The update is complete!