Merge lp:~kees/charms/precise/sbuild/trunk into lp:charms/sbuild

[Kees Cook]

Config updates, maintainer addition.

[Mark Mims (mark-mims)]

review: Approve

=== modified file 'README'
--- README	2011-12-07 17:31:20 +0000
+++ README	2012-06-19 18:32:20 +0000
@@ -10,18 +10,18 @@
 
 For example, to throw a bug-squashing party:
 
-...configure juju and local.yaml for the password salt, distros, etc...
+...configure juju and sbuild.yaml for the password salt, distros, etc...
 
 juju boostrap
 ...time passes...
 
-juju deploy --config local.yaml --repository /scratch/ubuntu/vcs/juju/examples local:sbuild builder-debian
-juju add-unit builder-debian
-juju add-unit builder-debian
-juju add-unit builder-debian
+juju deploy --config sbuild.yaml --repository /scratch/ubuntu/vcs/juju/examples local:sbuild builder-bsp
+juju add-unit builder-bsp
+juju add-unit builder-bsp
+juju add-unit builder-bsp
 ...
 
 ...time passes...
 
 # Dump reports printable on little slips of paper to hand out at the party:
-./slips | mpage -1 | lp
+./slips builder-bsp | mpage -1 | lp

=== modified file 'config.yaml'
--- config.yaml	2011-11-19 22:12:33 +0000
+++ config.yaml	2012-06-19 18:32:20 +0000
@@ -8,11 +8,11 @@
         default: unset
         description: Salt for generating builder accounts.
         validator: '.{8,}'
-    distro:
-        type: string
-        default: ubuntu
-        description: Which distribution to create a build environment for.
-    releases:
-        type: string
-        default: precise
-        description: Comma-separated list of releases to create chroots for.
+    chroots:
+        type: string
+        default: ubuntu:quantal
+        description: Space-separated list of distro:release,release to create chroots for.
+    packages:
+        type: string
+        default: ""
+        description: Comma-separated list of extra packages to install in chroots.

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2011-11-19 22:12:33 +0000
+++ hooks/config-changed	2012-06-19 18:32:20 +0000
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ex
 
 USERNAME=$(config-get username)
 SALT=$(config-get salt)
@@ -7,8 +8,11 @@
 juju-log "On $JUJU_UNIT_NAME $USERNAME password is '$password'"
 echo "$USERNAME:$password" | chpasswd
 
-DISTRO=$(config-get distro)
-RELEASES=$(config-get releases)
+CHROOTS=$(config-get chroots)
+PACKAGES=$(config-get packages)
+if [ -n "$PACKAGES" ]; then
+    PACKAGES="--debootstrap-include=$PACKAGES"
+fi
 
 ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 arches=$ARCH
@@ -16,12 +20,18 @@
     arches="$arches i386"
 fi
 for arch in $arches; do
-    for rel in $(echo $RELEASES | sed -e 's/,/ /g'); do
-        source=$rel-$arch
-        if ! schroot -l | egrep -q "^source:$source$"; then
-            juju-log "Building $DISTRO $rel $arch environment."
-            EDITOR=cat su -c "/usr/bin/mk-sbuild --distro $DISTRO --arch $arch $rel" $USERNAME
-        fi
+    for item in $CHROOTS; do
+        distro=$(echo "$item" | cut -d: -f1)
+        releases=$(echo "$item" | cut -d: -f2)
+        for rel in $(echo $releases | sed -e 's/,/ /g'); do
+            source=$rel-$arch
+            if ! schroot -l | egrep -q "^source:$source$"; then
+                juju-log "Building $distro $rel $arch environment."
+                EDITOR=cat su -c "/usr/bin/mk-sbuild --distro $distro --arch $arch $PACKAGES $rel" $USERNAME
+            fi
+        done
     done
 done
 perl -pi -e 's/^#source-root-groups=/source-root-groups=/g' /etc/schroot/chroot.d/*
+
+exit 0

=== modified file 'hooks/install'
--- hooks/install	2012-04-16 21:15:04 +0000
+++ hooks/install	2012-06-19 18:32:20 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 USERNAME=$(config-get username)
 DISTRO=$(config-get distro)
@@ -46,18 +46,18 @@
     su -c "sbuild-update --keygen" $USERNAME
 fi
 
-ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
-arches=$ARCH
-if [ "$arches" = "amd64" ]; then
-    arches="$arches i386"
-fi
-for arch in $arches; do
-    for rel in $(echo $RELEASES | sed -e 's/,/ /g'); do
-        source=$rel-$arch
-        if ! schroot -l | egrep -q "^source:$source$"; then
-            juju-log "Building $DISTRO $rel $arch environment."
-            EDITOR=cat su -c "/usr/bin/mk-sbuild --distro $DISTRO --arch $arch $rel" $USERNAME
-        fi
-    done
-done
-perl -pi -e 's/^#source-root-groups=/source-root-groups=/g' /etc/schroot/chroot.d/*
+rm -f /etc/update-motd.d/98-cloudguest
+cat >/etc/update-motd.d/98-sbuild <<EOM
+#!/bin/bash
+echo ""
+echo "###################################################################"
+echo "# Welcome to your own personal 'sbuild' machine. For details see: #"
+echo "#                                                                 #"
+echo "#   http://wiki.debian.org/BSP/2011/12/us/Portland/Builders       #"
+echo "#   http://wiki.debian.org/mk-sbuild                              #"
+echo "#                                                                 #"
+echo "###################################################################"
+EOM
+chmod a+rx /etc/update-motd.d/98-sbuild
+
+exit 0

=== modified file 'hooks/report'
--- hooks/report	2011-11-19 22:12:33 +0000
+++ hooks/report	2012-06-19 18:32:20 +0000
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -ex
+
 EXTERNAL="$1"
 
 if [ -n "$JUJU_UNIT_NAME" ]; then

=== modified file 'hooks/start'
--- hooks/start	2011-11-19 22:12:33 +0000
+++ hooks/start	2012-06-19 18:32:20 +0000
@@ -1,3 +1,3 @@
 #!/bin/bash
-set -e
+set -ex
 exit 0

=== modified file 'hooks/stop'
--- hooks/stop	2011-11-19 22:12:33 +0000
+++ hooks/stop	2012-06-19 18:32:20 +0000
@@ -1,3 +1,4 @@
 #!/bin/bash
-set -e
+set -ex
 schroot -e --all-sessions
+exit 0

=== modified symlink 'hooks/upgrade-charm' (properties changed: -x to +x)
=== target was u'install'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2012-06-19 18:32:20 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -ex
+
+hooks/stop
+hooks/install
+hooks/config-changed
+hooks/start
+
+exit 0

=== modified file 'hooks/wipe'
--- hooks/wipe	2011-11-19 22:12:33 +0000
+++ hooks/wipe	2012-06-19 18:32:20 +0000
@@ -1,3 +1,4 @@
 #!/bin/bash
+set -ex
 schroot -e --all-sessions
 rm -rf /var/lib/schroot/chroots/* /etc/schroot/chroot.d/*

=== modified file 'metadata.yaml'
--- metadata.yaml	2011-11-19 22:12:33 +0000
+++ metadata.yaml	2012-06-19 18:32:20 +0000
@@ -2,3 +2,7 @@
 summary: "sbuild environment"
 description: |
     Installs an sbuild and schroot environment for package building.
+maintainer: Kees Cook <[e-mail]>
+provides:
+  package-builder:
+    interface: sbuild

=== modified file 'revision'
--- revision	2011-11-19 22:12:33 +0000
+++ revision	2012-06-19 18:32:20 +0000
@@ -1,1 +1,1 @@
-17
+22

=== modified file 'slips' (properties changed: -x to +x)
--- slips	2011-12-07 17:31:20 +0000
+++ slips	2012-06-19 18:32:20 +0000
@@ -2,8 +2,10 @@
 # Produce per-machine reports to be handed out on slips of paper.
 set -e
 
+SERVICE="$1"
+
 juju status 2>/dev/null | \
-    egrep 'builder-debian/|public-address' | \
+    egrep "$SERVICE/|public-address" | \
     sed '$!N;s/\n/ /;s/://;s/\//-/' | \
     awk '{print  $1 " " $3}' | \
 while read unit host; do