Benji York has proposed merging lp:~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot into lp:~yellow/charms/oneiric/buildbot-master/trunk.
Requested reviews: Launchpad Yellow Squad (yellow) For more details, see: https://code.launchpad.net/~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot/+merge/90779 Use Lucid's version of buildbot. -- https://code.launchpad.net/~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot/+merge/90779 Your team Launchpad Yellow Squad is requested to review the proposed merge of lp:~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot into lp:~yellow/charms/oneiric/buildbot-master/trunk.
=== added file '.bzrignore' --- .bzrignore 1970-01-01 00:00:00 +0000 +++ .bzrignore 2012-01-30 20:42:28 +0000 @@ -0,0 +1,1 @@ +.emacs* === modified file 'hooks/install' --- hooks/install 2012-01-30 14:43:09 +0000 +++ hooks/install 2012-01-30 20:42:28 +0000 @@ -5,9 +5,12 @@ juju-log "--> install" BUILDBOT_DIR=`config-get installdir` -apt-get install -y buildbot sharutils -# Needed only for the demo site. -apt-get install -y git +apt-get install -y sharutils bzr + +# Get the lucid version of buildbot. +apt-add-repository "deb http://us.archive.ubuntu.com/ubuntu/ lucid main universe" +apt-get update +apt-get install -y buildbot/lucid juju-log "Creating master in '$BUILDBOT_DIR'." # Since we may be installing into a pre-existing service, ensure the @@ -17,6 +20,6 @@ rm -rf "$BUILDBOT_DIR" fi mkdir -p "$BUILDBOT_DIR" -buildbot create-master "$BUILDBOT_DIR" -mv "$BUILDBOT_DIR"/master.cfg.sample "$BUILDBOT_DIR"/master.cfg +cp -r "$CHARM_DIR"/lpbuildbot/* "$BUILDBOT_DIR" + juju-log "<-- install" === modified file 'revision' --- revision 2012-01-30 16:43:59 +0000 +++ revision 2012-01-30 20:42:28 +0000 @@ -1,1 +1,5 @@ +<<<<<<< TREE 48 +======= +46 +>>>>>>> MERGE-SOURCE
-- Mailing list: https://launchpad.net/~yellow Post to : [email protected] Unsubscribe : https://launchpad.net/~yellow More help : https://help.launchpad.net/ListHelp
