Merge lp:~dave-cheney/juju-core/046-cmd-builddb-quantal into lp:~juju/juju-core/trunk

[Dave Cheney]

cmd/builddb: add support for quantal

Add support for building a quantal spec mongodb

https://codereview.appspot.com/6853048/

[lp:~dave-cheney/juju-core/046-cmd-builddb-quantal]

719. By Dave Cheney on 2012-11-14

remove build number subrevision

[Roger Peppe (rogpeppe)]

On 2012/11/14 04:42:08, dfc wrote:
> Please take a look.

LGTM
seems a pity we have to duplicate the entire charm for a one word
change, but I guess that's where we are.

https://codereview.appspot.com/6853048/

[Gustavo Niemeyer (niemeyer)]

On 2012/11/14 09:18:09, rog wrote:
> On 2012/11/14 04:42:08, dfc wrote:
> > Please take a look.

> LGTM
> seems a pity we have to duplicate the entire charm for a one word
change, but I
> guess that's where we are.

You have a good point. You don't have to say LGTM when you disagree.

Dave, can we use symlinks to a single charm, and make the build script
grab the release name from /etc/lsb-release?

https://codereview.appspot.com/6853048/

[Gustavo Niemeyer (niemeyer)]

LGTM, but only if the duplication is avoided.

https://codereview.appspot.com/6853048/

Unmerged revisions

719. By Dave Cheney on 2012-11-14

remove build number subrevision

718. By Dave Cheney on 2012-11-14

gofmt

717. By Dave Cheney on 2012-11-14

add quantal

716. By William Reade on 2012-11-13

uniter_test: snappier waitUniterDead

waitUniterDead was on occasion waiting almost the full 5 seconds before the
uniter happened to notice it was ready to die. We now repeatedly sync state
while waiting, in order to ensure timely detection of state changes on the
uniter side. On this machine, this change speeds up the uniter suite by
roughly 20%.

R=
CC=
https://codereview.appspot.com/6815089

715. By Roger Peppe on 2012-11-13

environs/jujutest: further refinement

We change to use attributes rather than config.Config.
This enables us to have configuration values drawn from an environment
set up for the test, for instance from a faked-up home directory.

R=fwereade, TheMue
CC=
https://codereview.appspot.com/6851043

714. By Roger Peppe on 2012-11-13

environs/jujutest: simplify interface

The Environs/Name pair was a relic from when
we couldn't open an environment from its attributes
only. Using attributes makes it easier to
have values that are programmatically generated,
or bulky.

R=john.meinel, fwereade, TheMue
CC=
https://codereview.appspot.com/6849044

713. By Dave Cheney on 2012-11-02

contrib: add release-public-tools script

Initial cut of a script to turn a release deb into a
set of tools. This may be incorporated into the release
build process later.

R=TheMue, john.meinel
CC=
https://codereview.appspot.com/6818074

712. By Dave Cheney on 2012-11-02

all: gofmt

rev 57768598a495 of go fmt now trims trailing whitespace. This has no impact on people using 1.0.x or go tip prior to 57768598a495.

R=john.meinel, aram
CC=
https://codereview.appspot.com/6810065

711. By Gustavo Niemeyer on 2012-11-02

testing: improve a bit sample charm situation

Make dummy-v2 trivial and rename it to format.

Rename old/new from sample to upgrade, and name their
directories properly.

R=fwereade
CC=
https://codereview.appspot.com/6823050

710. By Gustavo Niemeyer on 2012-11-02

state: handle unassignments on MachineUnitsWatcher

R=fwereade, aram, <email address hidden>
CC=
https://codereview.appspot.com/6775076

=== modified file 'cmd/builddb/main.go'
--- cmd/builddb/main.go	2012-10-11 17:40:17 +0000
+++ cmd/builddb/main.go	2012-11-14 04:43:20 +0000
@@ -6,6 +6,7 @@
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/version"
 	corelog "log"
 	"os"
 	"path/filepath"
@@ -36,7 +37,7 @@
 		return err
 	}
 	repo := &charm.LocalRepository{filepath.Dir(os.Args[0])}
-	curl := charm.MustParseURL("local:precise/builddb")
+	curl := charm.MustParseURL("local:" + version.Current.Series + "/builddb")
 	ch, err := conn.PutCharm(curl, repo, false)
 	if err != nil {
 		return err

=== added directory 'cmd/builddb/quantal'
=== added directory 'cmd/builddb/quantal/builddb'
=== added directory 'cmd/builddb/quantal/builddb/hooks'
=== added file 'cmd/builddb/quantal/builddb/hooks/install'
--- cmd/builddb/quantal/builddb/hooks/install	1970-01-01 00:00:00 +0000
+++ cmd/builddb/quantal/builddb/hooks/install	2012-11-14 04:43:20 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+VERSION=2.2.0
+RELEASE=quantal
+ARCH=amd64
+
+BASE=$PWD
+
+apt-get install -y git-core build-essential scons nginx libssl-dev
+
+# Grab the source code.
+git clone https://github.com/mongodb/mongo.git
+cd mongo
+git checkout r$VERSION
+
+# Build it with SSL enabled and mostly statically.
+mkdir $BASE/opt
+scons install --64 --ssl --release --prefix=$BASE/opt/mongo
+
+# Pack it up.
+cd $BASE/opt
+tar cjvf mongo-$VERSION-$RELEASE-$ARCH.tgz mongo/bin
+
+# Publish it at nginx's root and enable autoindexing.
+rm -rf /usr/share/nginx/www/*
+cp mongo-*.tgz /usr/share/nginx/www
+sed -i 's/index .*index.html.*/autoindex on;/' /etc/nginx/sites-available/default

=== added file 'cmd/builddb/quantal/builddb/hooks/start'
--- cmd/builddb/quantal/builddb/hooks/start	1970-01-01 00:00:00 +0000
+++ cmd/builddb/quantal/builddb/hooks/start	2012-11-14 04:43:20 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+/etc/init.d/nginx restart
+
+open-port 80

=== added file 'cmd/builddb/quantal/builddb/metadata.yaml'
--- cmd/builddb/quantal/builddb/metadata.yaml	1970-01-01 00:00:00 +0000
+++ cmd/builddb/quantal/builddb/metadata.yaml	2012-11-14 04:43:20 +0000
@@ -0,0 +1,4 @@
+name: builddb
+summary: Abusive charm that builds MongoDB from source
+description: |
+        Abusive charm that builds MongoDB from source.