...
- Go to an up-to-date local distribution of trunk.
- From the trunk distribution use the 'avail' command (above) to find the branch of interest.
- Use the following command to find the revision(s) of interest:
Code Block python svnmerge.py avail -S <your branch>
- Import the changes from the branch into trunk:
- For all changes
Code Block python svnmerge.py merge -S <your branch>
- For particular changes
Code Block python svnmerge.py merge -r <your revisions comma separated> -S <your branch>
- For all changes
- Resolve conflicts, compile, test and commit.
Elastic Bamboo
We currently have MySQL running on our Elastic Bamboo host for the purposes of integration testing. This is accomplished by the customise-extras.sh shell script which is run at boot time for the hosts.
If you want to import a database dump, install Crowd, etc., here is how to modify that script:
- Log onto the currently running elastic instance (or spawn one if none are running). http://confluence.atlassian.com/display/BAMBOO/Accessing+an+Elastic+Instance
- Note that the ssh key is on
belltown:/work/platform/PasswordsAndCredentials/AtlassianAccountAWSCredentials/elasticbamboo.pk
- Note that if you want to log onto the AWS console, Mike's username and password is on
belltown:/work/platform/PasswordsAndCredentials/AtlassianAccountAWSCredentials/Mike'sPassword
- Note that the ssh key is on
- From the shell try out the commands you want to run at boot time
- Run you build and make sure it works
- Check your changes to customize-extras.sh into source control PLFM/trunk/tools/bamboo/bin/customise-extras.sh
- On the bamboo host, overwrite
/mnt/bamboo-ebs/bin/customise-extras.sh
with your updated script. - Follow these instructions to create snapshot and configure bamboo to use it Updating your EBS snapshot
- Shutdown the host, and kick off a new build. This should start a new bamboo host that will run your updated script.
- Make sure the build passes!
For more information, see:
- http://confluence.atlassian.com/display/BAMBOO/Configuring+Elastic+Instances+to+use+the+EBS
- http://confluence.atlassian.com/display/BAMBOO/Populating+your+EBS+volume
Tools To Know About
Pretty-Print JSON
...