Merge lp:~salgado/offspring/all-python-config into lp:offspring

[Guilherme Salgado]

This is a second attempt at trying to get these changes merged. They are a pre-requisite for another branch (lp:~salgado/offspring/path-independence) which simplify things a lot for developers.

Here's what Michael said in the original merge proposal:

This is a rebasing of my lexbuilder all-python-config-2 branch onto offspring.

It removes the shell config, moves the relevant options into offspring.cfg and adds a script that dumps out the configuration for a build in shell format. It also adds support for loading a offspring.cfg.`hostname` file.

I went to some lengths to avoid having to change the shell scripts at all, probably too far -- things like having lexbuilder-builder-config output both IBS_BINDIR and IBS_BIN_DIR are probably a bit silly. I have a follow-up branch that changes things to be more consistent here.

Please let me know what you think.

[lp:~salgado/offspring/all-python-config]

29. By Guilherme Salgado on 2011-11-02

merge trunk

30. By Guilherme Salgado on 2011-11-02

Turn offspring-builder-config into a regular python module and run it using python -m to get the config

[Guilherme Salgado (salgado)]

PYTHONPATH doesn't seem to be set on offspring-build, so we need to set it in the eval line where we generate the builder config

[lp:~salgado/offspring/all-python-config]

31. By Guilherme Salgado on 2011-11-03

Make builder_config.py not print anything to stdout if it's imported and move the bulk of the code into a function so that it can be tested

32. By Guilherme Salgado on 2011-11-03

Change get_config_variables() to return a set of tuples instead of a set of strings

33. By Guilherme Salgado on 2011-11-04

Undo revisions 30-32, but don't uncommit because Cody wants to keep this history

[Cody A.W. Somerville (cody-somerville)]

review: Approve

=== removed file 'config/offspring-builder.config'
--- config/offspring-builder.config	2010-12-02 16:24:39 +0000
+++ config/offspring-builder.config	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#
-# Builder configuration settings
-#
-################################################################################
-
-# IBS_BASEDIR - Base directory for build system.
-# IBS_BINDIR - Directory containing scripts and binaries.
-# IBS_FINALDESTDIR - Base directory of final destination of build output.
-# IBS_CONFIGDIR - Directory for project configuration files.
-# IBS_WORKDIR - Directory where we perform the actual builds in.
-# IBS_PROJECTCONFIGDIR - Directory where we keep mirror of project config branches.
-
-IBS_BASEDIR="/srv"
-IBS_BINDIR="${IBS_BASEDIR}/bin"
-IBS_SCRIPTDIR="${IBS_BASEDIR}/scripts/"
-IBS_FUNCDIR="${IBS_BASEDIR}/lib/offspring/build/functions/"
-IBS_WRAPPERDIR="${IBS_BASEDIR}/lib/offspring/build/wrappers/"
-IBS_RESULTDIR="${IBS_BASEDIR}/builds"
-IBS_CONFIGDIR="${IBS_BASEDIR}/config"
-IBS_WORKDIR="/var/tmp/offspring"
-IBS_PROJECTCONFIG_CACHEDIR="/var/tmp/offspring-projects"
-
-# Results directory names
-# IBS_RESULT_IMAGEDIR - Name of directory to place images in, inside resultdir.
-# IBS_RESULT_CONFIGDIR - Name of directory to place build config in, inside resultdir.
-# IBS_RESULT_LOGDIR - Directory to place log files in, inside resultdir.
-# IBS_RESULT_PROJDIR - Directory to place project files in, inside resultdir.
-# IBS_RESULT_SRCDIR - Directory to place source files in, inside resultdir.
-
-IBS_RESULT_IMAGEDIR="images"
-IBS_RESULT_CONFIGDIR="config"
-IBS_RESULT_LOGDIR=""
-IBS_RESULT_REPORTSDIR="reports"
-IBS_RESULT_PROJDIR="project"
-IBS_RESULT_SRCDIR="source"
-
-# IBS_LAUNCHPAD_BOT_ID - ID for launchpad account used to fetch bzr branches.
-
-IBS_LAUNCHPAD_BOT_ID="${USERNAME}"
-
-# DEBUG - Toggle debug mode: enabled or disabled.
-
-DEBUG="disabled"
-
-# IBS_SANITY_HOST - Force script to only run on specified host.
-# IBS_SANITY_USER - Force script to only run as specified user.
-# IBS_SANITY_OVERRIDE - Toggle sanity override: enabled or disabled.
-
-IBS_SANITY_HOST="`hostname`"
-IBS_SANITY_USER="${USERNAME}"
-IBS_SANITY_OVERRIDE="disabled"
-
-# IBS_BUILDER_STATEFILE - Lockfile containing info about the current build.
-
-IBS_BUILDER_STATEFILE="${IBS_BINDIR}/.offspring-build.lock"
-
-# IBS_CHECKSUM_TYPES - List of checksums to use for computing hashes of results
-
-IBS_CHECKSUM_TYPES="sha1 md5"
-
-# IBS_KEEP_BUILDFAILURES - Keep workdir of build failures?: enabled or disabled.
-# IBS_TRACE_ERRORS - Print execute trace on error?: enabled or disabled.
-
-IBS_KEEP_BUILDFAILURES="disabled"
-IBS_TRACE_ERRORS="disabled"
-
-# IBS_SIGN_BUILDS - Toggle the signing of build hashsum files using GPG.
-# IBS_GPG_KEYRING - Path to keyring containing secret keys.
-
-IBS_SIGN_BUILDS="enabled"
-IBS_GPG_KEYRING="${IBS_CONFIGDIR}/keyring.gpg"
-
-# IBS_DISTRIBUTION_CHANNEL_DESCRIPTOR_PREFIX - The prefix of the
-# ubuntu channel descriptor that will be generated.  See
-# https://wiki.ubuntu.com/DistributionChannelDescriptor for more.
-IBS_DISTRIBUTION_CHANNEL_DESCRIPTOR_PREFIX="offspring-${HOSTNAME}"
-
-# ARCHIVE_MODE - 0: delete only; 1: delete and rsync to remote host.
-# ARCHIVE_THRESHOLD - The age before any archiving actions can occur.
-
-ARCHIVE_MODE=0
-ARCHIVE_THRESHOLD=7
-
-# ARCHIVE_HOST - Host name of machine to archive to.
-# ARCHIVE_USER - User to authenticate as to archive build.
-# ARCHIVE_DESTINATION - Path to archive build to on remote host.
-
-# These options can be left blank if in mode 0.
-
-ARCHIVE_HOST=
-ARCHIVE_USER=
-ARCHIVE_DESTINATION=
-
-# PURGE_IMAGE_AGE - The age of images before they're deleted.
-# PURGE_PROJ_AGE - The age of saved projects before they're deleted.
-# SHELVE_DIR_AGE - The age before the directory is moved in an archive dir.
-
-# Warning: If SHELVE_DIR_AGE is younger than PURGE_* then the directory will
-# be moved into the archive directory *WITH* the undeleted, large files and they
-# will not automatically be deleted.
-#
-
-PURGE_IMAGE_AGE=7
-PURGE_PROJ_AGE=9
-SHELVE_DIR_AGE=365

=== modified file 'config/offspring.cfg'
--- config/offspring.cfg	2011-05-30 22:18:12 +0000
+++ config/offspring.cfg	2011-11-04 21:07:25 +0000
@@ -20,6 +20,7 @@
 # instance_name: A friendly name for the installation, used in emails.
 # instance_email: Mail will be sent from this address (in the sense of
 #     both envelope sender and the From: header)
+# build_statefile: Path to the offspring statefile.
 #
 #===============================================================================
 
@@ -33,6 +34,7 @@
 discussion_email: 
 instance_name: Offspring Image Build System
 instance_email: offspring@localhost
+build_statefile: %(bin_dir)s/.offspring-build.lock
 
 #===============================================================================
 # Offspring Web
@@ -52,10 +54,108 @@
 releases_uri_base: https://offspring-share/releases
 
 #===============================================================================
+# Offspring Builder
+#
+# builder_statefile: Path to the offspring statefile (renamed from build_statefile)
+# basedir: Renamed from base_dir
+# configdir: Renamed from config_dir
+# bindir: Renamed from bin_dir
+# wrapperdir: XXX
+# funcdir: XXX
+# scriptdir: XXX
+# keep_buildfailures: Keep workdir of build failures?: enabled or disabled
+# launchpad_bot_id: ID for launchpad account used to fetch bzr branches.
+# projectconfig_cachedir: Directory where we keep mirror of project config branches.
+# proxy: HTTP proxy to use for the build steps.
+# resultdir: Base directory of final destination of build output.
+# sanity_override: Toggle sanity override: enabled or disabled.
+# sanity_host: Force script to only run on specified host.
+# sanity_user: Force script to only run as specified user.
+# sign_builds: Toggle the signing of build hashsum files using GPG. enabled or disabled
+# gpg_keyring: Path to keyring containing secret keys.
+# trace_errors: Print execute trace on error?: enabled or disabled
+# workdir: Directory where we perform the actual builds in.
+# debug: Toggle debug mode: enabled or disabled.
+# result_imagedir: Name of directory to place images in, inside resultdir.
+# result_srcdir: Directory to place source files in, inside resultdir.
+# result_configdir: Name of directory to place build config in, inside resultdir.
+# result_projdir: Directory to place project files in, inside resultdir.
+# result_reportsdir: Directory to place reports in, inside resultdir.
+# result_logdir: Directory to place log files in, inside resultdir.
+# checksum_types: List of checksums to use for computing hashes of results.
+# distribution_channel_prefix: The prefix of the ubuntu channel
+#     descriptor that will be generated.  See
+#     https://wiki.ubuntu.com/DistributionChannelDescriptor for more.
+# ===============================================================================
+
+[builder]
+builder_statefile: %(build_statefile)s
+basedir: %(base_dir)s
+configdir: %(config_dir)s
+bindir: %(bin_dir)s
+wrapperdir: %(base_dir)s/lib/offspring/build/wrappers/
+funcdir: %(base_dir)s/lib/offspring/build/functions/
+scriptdir: %(base_dir)s/scripts/
+keep_buildfailures: disabled
+launchpad_bot_id: %(username)s
+projectconfig_cachedir: /var/tmp/offspring-projects
+proxy:
+resultdir: %(base_dir)s/builds
+sanity_override: disabled
+sanity_host: %(hostname)s
+sanity_user: %(username)s
+sign_builds: enabled
+gpg_keyring: %(config_dir)s/keyring.gpg
+trace_errors: disabled
+workdir: /var/tmp/offspring
+debug: disabled
+result_imagedir: images
+result_srcdir: source
+result_configdir: config
+result_projdir: project
+result_reportsdir: reports
+result_logdir:
+checksum_types: sha1 md5
+distribution_channel_descriptor_prefix: offspring-%(hostname)s
+
+#===============================================================================
+# Offspring Build Archiver
+#
+# archive_mode: 0: delete only; 1: delete and rsync to remote host.
+# archive_threshold: The age before any archiving actions can occur.
+#
+# archive_host: Host name of machine to archive to.
+# archive_user: User to authenticate as to archive build.
+# archive_destination: Path to archive build to on remote host.
+#
+#     These options can be left blank if in mode 0.
+#
+# purge_image_age: The age of images before they're deleted.
+# purge_proj_age: The age of saved projects before they're deleted.
+# shelve_dir_age: The age before the directory is moved in an archive dir.
+#
+#     Warning: If shelve_dir_age is younger than PURGE_* then the
+#     directory will be moved into the archive directory *WITH* the
+#     undeleted, large files and they will not automatically be
+#     deleted.
+#
+#===============================================================================
+
+[archiver]
+archive_mode: 0
+archive_threshold: 7
+archive_host:
+archive_user:
+archive_destination:
+purge_image_age: 7
+purge_proj_age: 9
+shelve_dir_age: 365
+
+
+#===============================================================================
 # Offspring Slave
 #
 # build_command: Command to execute to build a project
-# build_statefile: Path to the offspring statefile.
 # child_wait_timeout: Seconds to give a shutting down build before terminating
 # xmlrpc_server_auth: Authentication details for slave via xmlrpc
 # logfile: Path to file where slave will log to
@@ -65,7 +165,6 @@
 
 [slave]
 build_command: %(bin_dir)s/offspring-build
-build_statefile: %(bin_dir)s/.offspring-build.lock
 child_wait_timeout: 5
 xmlrpc_server_auth: admin:password
 request_timeout: 60.0

=== modified file 'docs/INSTALL'
--- docs/INSTALL	2011-08-31 16:33:29 +0000
+++ docs/INSTALL	2011-11-04 21:07:25 +0000
@@ -27,8 +27,7 @@
   /usr/bin/lb *, \
   /usr/sbin/chroot /var/tmp/offspring/*
 
- 3. Update config/offspring.cfg and config/offspring-builder.config as 
-    required.
+ 3. Update config/offspring.cfg as required.
 
  4. In the root of the installation (where the Makefile resides), execute
     'make slave'.
@@ -44,8 +43,8 @@
  * If you have multiple slaves, you'll want to mount an NFS share or similar
    on the build results directory.
  * If you wish to sign your build results, export the private key to the file
-   configured in config/offspring-builder.config and ensure the account
-   running the build process has the public key in its keyring.
+   configured in config/offspring.cfg and ensure the account running the build
+   process has the public key in its keyring.
 
 == Web ==
 

=== modified file 'lib/offspring/build/bin/offspring-build'
--- lib/offspring/build/bin/offspring-build	2011-01-22 03:13:06 +0000
+++ lib/offspring/build/bin/offspring-build	2011-11-04 21:07:25 +0000
@@ -6,12 +6,21 @@
 set -e
 
 _Initialize() {
-    if [ -z "${OFFSPRING_CONFIGSCRIPT}" ]
-    then
-        OFFSPRING_CONFIGSCRIPT="/srv/config/offspring-builder.config"
-    fi
-
-    source "${OFFSPRING_CONFIGSCRIPT}"
+    if [ -z "${OFFSPRING_CONFIGSCRIPT}" ]; then
+        OFFSPRING_CONFIGSCRIPT="/srv/bin/offspring-builder-config"
+    fi
+
+    if [ \! -x "${OFFSPRING_CONFIGSCRIPT}" ]; then
+        printf "Could not find config script at $OFFSPRING_CONFIGSCRIPT\n" >& 2
+        exit 1
+    fi
+
+    eval `"${OFFSPRING_CONFIGSCRIPT}"`
+
+    if [ $? -ne 0 ]; then
+        printf "Executing config script at $OFFSPRING_CONFIGSCRIPT failed.\n" >& 2
+        exit 1
+    fi
 
     # Load build system components
     source "${IBS_FUNCDIR}/echo.sh"
@@ -21,10 +30,7 @@
     source "${IBS_FUNCDIR}/logging.sh"
     source "${IBS_FUNCDIR}/files.sh"
 
-    # Reload config script to load host overrides
-    Load_script_configfile "${OFFSPRING_CONFIGSCRIPT}"
-
-    [ -n "${PROXY}" ] && export http_proxy="${PROXY}"
+    [ -n "${IBS_PROXY}" ] && export http_proxy="${IBS_PROXY}"
 
     umask 022
 
@@ -73,7 +79,7 @@
         Error "Unable to create result logfile directory '%s'." "${RESULTDIR_LOGFILE}"
         exit 1
     fi
-    
+
     Catch_faults enable
 
     Print "START: %s build %s started at '%s'." "${PROJECT}" "${BUILDNAME}" "`date`"
@@ -99,11 +105,11 @@
     if [ -L ${IBS_RESULTDIR}/${PROJECT}/previous ]; then
         cp -d ${IBS_RESULTDIR}/${PROJECT}/previous ${IBS_RESULTDIR}/${PROJECT}/current/previous
     fi
-    
+
     # Set up working dir
     mkdir -p ${IBS_WORKDIR}/${PROJECT}
     pushd ${IBS_WORKDIR}/${PROJECT} > /dev/null 2>&1
-    
+
 }
 
 _Build() {
@@ -113,7 +119,7 @@
     Export_project_config "${PROJECT}" "${RESULTDIR_CONFIGFILES}/"
 
     Buildtool_build
-    
+
     Catch_faults permit_errors
     if [ "${IBS_SIGN_BUILDS}" = "enabled" ]
     then
@@ -137,7 +143,7 @@
         Info "Build result signing is disabled."
     fi
     Catch_faults disallow_errors
-    
+
     Info "Build stage completed at %s" "`date`"
 }
 
@@ -179,13 +185,10 @@
     exit 1
 fi
 
-# Initialize core
+# Initialize core & load settings
 echo "Performing initialization..."
 _Initialize
 
-# Load builder settings
-Load_defaults
-
 # Setup and start logging
 _Setup
 

=== modified file 'lib/offspring/build/functions/config.sh'
--- lib/offspring/build/functions/config.sh	2010-11-29 08:27:24 +0000
+++ lib/offspring/build/functions/config.sh	2011-11-04 21:07:25 +0000
@@ -91,27 +91,6 @@
     dpkg-query -W > "${_DESTINATION}/${HOSTNAME}.manifest"
 }
 
-Load_defaults() {
-    IBS_BASEDIR="${IBS_BASEDIR:-/srv}"
-    IBS_BINDIR="${IBS_BINDIR:-${IBS_BASEDIR}/bin}"
-    IBS_RESULTDIR="${IBS_RESULTDIR:-${IBS_BASEDIR}/builds}"
-    IBS_WORKDIR="${IBS_WORKDIR:-/var/tmp/offspring}"
-    IBS_CONFIGDIR="${IBS_CONFIGDIR:-${IBS_BASEDIR}/config}"
-    IBS_PROJECTCONFIG_CACHEDIR="${IBS_PROJECTCONFIG_CACHEDIR:-/var/tmp/offspring-project-config}"
-
-    IBS_BUILDTOOL="${IBS_BUILDTOOL:-mic}"
-
-    IBS_RESULT_IMAGEDIR="${IBS_RESULT_IMAGEDIR:-images}"
-    IBS_RESULT_CONFIGDIR="${IBS_RESULT_CONFIGDIR:-config}"
-    IBS_RESULT_LOGDIR="${IBS_RESULT_LOGDIR:-}"
-    IBS_RESULT_REPORTSDIR="${IBS_RESULT_REPORTSDIR:-reports}"
-    IBS_RESULT_PROJDIR="${IBS_RESULT_PROJDIR:-project}"
-    IBS_RESULT_SRCDIR="${IBS_RESULT_SRCDIR:-source}"
-
-    IBS_SANITY_USER="${IBS_SANITY_USER:-`whoami`}"
-    IBS_SANITY_HOST="${IBS_SANITY_HOST:-${HOSTNAME}}"
-}
-
 Check_sanity() {
     if [ "${IBS_SANITY_OVERRIDE}" != "enabled" ]; then
         Action "Performing sanity check"

=== modified file 'lib/offspring/build/functions/echo.sh'
--- lib/offspring/build/functions/echo.sh	2010-11-29 08:27:24 +0000
+++ lib/offspring/build/functions/echo.sh	2011-11-04 21:07:25 +0000
@@ -10,7 +10,7 @@
 }
 
 Debug() {
-    if [ "${DEBUG}" = "enabled" ]; then
+    if [ "${IBS_DEBUG}" = "enabled" ]; then
       STRING="D: ${1}"
       shift || true
        Print "${STRING}" "$@" >&2

=== modified file 'lib/offspring/build/scripts/archive-builds'
--- lib/offspring/build/scripts/archive-builds	2010-12-03 04:35:48 +0000
+++ lib/offspring/build/scripts/archive-builds	2011-11-04 21:07:25 +0000
@@ -8,11 +8,23 @@
 # XXX: This script needs to be rewritten to use new framework.
 #
 
-if [ -z $OFFSPRING_CONFIGSCRIPT ]; then
-    OFFSPRING_CONFIGSCRIPT="/srv/config/offspring-builder.config"
-fi
-
-source "$OFFSPRING_CONFIGSCRIPT"
+if [ -z "${OFFSPRING_CONFIGSCRIPT}" ]; then
+    OFFSPRING_CONFIGSCRIPT="/srv/bin/offspring-builder-config"
+fi
+
+if [ \! -x "${OFFSPRING_CONFIGSCRIPT}" ]; then
+    printf "Could not find config script at $OFFSPRING_CONFIGSCRIPT\n" >& 2
+    exit 1
+fi
+
+eval `"${OFFSPRING_CONFIGSCRIPT}"`
+
+if [ $? -ne 0 ]; then
+    printf "Executing config script at $OFFSPRING_CONFIGSCRIPT failed.\n" >& 2
+    exit 1
+fi
+
+source "$CONFIGSCRIPT"
 
 # calculateBuildAge DATE
 calculateBuildAge() {
@@ -99,30 +111,30 @@
     echo "===== $project ====="
     echo
     echo "Now Processing project: $project"
-    echo "    Archive Age Threshold: $ARCHIVE_THRESHOLD"
-    echo "    Image Purge Age: $PURGE_IMAGE_AGE"
-    echo "    Saved Project Purge Age: $PURGE_PROJ_AGE"
-    echo "    Shelve Directory Age: $SHELVE_DIR_AGE"
+    echo "    Archive Age Threshold: $IBS_ARCHIVE_THRESHOLD"
+    echo "    Image Purge Age: $IBS_PURGE_IMAGE_AGE"
+    echo "    Saved Project Purge Age: $IBS_PURGE_PROJ_AGE"
+    echo "    Shelve Directory Age: $IBS_SHELVE_DIR_AGE"
     echo
     
     for day in `ls $IBS_RESULTDIR/$project/`; do
         if [ ! -L $IBS_RESULTDIR/$project/$day -a "$day" != "archive" ]; then
             declare -i age=$(calculateBuildAge $day)
             
-            if [ $age -gt $ARCHIVE_THRESHOLD ]; then
+            if [ $age -gt $IBS_ARCHIVE_THRESHOLD ]; then
                 declare -i ACTION_TAKEN=0
                 echo "I: $project/$day meets the archive threshold at $age day(s) old (`du -hs $IBS_RESULTDIR/$project/$day | cut -f 1`)"
                 
-                if [ $ARCHIVE_MODE -eq 1 -a ! -f "$IBS_RESULTDIR/$project/$day/.archived" ]; then
-                    echo "  I: Archiving $project builds from $day to $ARCHIVE_USER@$ARCHIVE_HOST/$ARCHIVE_DESTINATION/"
+                if [ $IBS_ARCHIVE_MODE -eq 1 -a ! -f "$IBS_RESULTDIR/$project/$day/.archived" ]; then
+                    echo "  I: Archiving $project builds from $day to $IBS_ARCHIVE_USER@$IBS_ARCHIVE_HOST/$IBS_ARCHIVE_DESTINATION/"
                     ACTION_TAKEN=1
                     if [ 1 -ne $SIMULATION ]; then
-                        rsync -av --progress $IBS_RESULTDIR/$project/$day/ "$ARCHIVE_USER@$ARCHIVE_HOST/$ARCHIVE_DESTINATION/$project-$day/"
+                        rsync -av --progress $IBS_RESULTDIR/$project/$day/ "$IBS_ARCHIVE_USER@$IBS_ARCHIVE_HOST/$IBS_ARCHIVE_DESTINATION/$project-$day/"
                         touch $IBS_RESULTDIR/$project/$day/.archived
                     fi
                 fi
                 
-                if [ $age -gt $PURGE_IMAGE_AGE ]; then
+                if [ $age -gt $IBS_PURGE_IMAGE_AGE ]; then
                     if [ -n "`find $IBS_RESULTDIR/$project/$day -name *.img -type f -print`" ]; then
                         echo "  I: Deleting images for $project builds from $day"
                         ACTION_TAKEN=1
@@ -168,7 +180,7 @@
                     fi
                 fi
                 
-                if [ $age -gt $PURGE_PROJ_AGE ]; then
+                if [ $age -gt $IBS_PURGE_PROJ_AGE ]; then
                     if [ -n "`find $IBS_RESULTDIR/$project/$day -name *.mic.tar.bz2 -type f -print`" ]; then
                         echo "  I: Deleting saved project for $project builds from $day"
                         ACTION_TAKEN=1
@@ -178,7 +190,7 @@
                      fi
                 fi
                 
-                if [ $age -gt $SHELVE_DIR_AGE ]; then
+                if [ $age -gt $IBS_SHELVE_DIR_AGE ]; then
                     echo "  I: Shelving directory for $project builds from $day"
                     ACTION_TAKEN=1
                     if [ 1 -ne $SIMULATION ]; then

=== added file 'lib/offspring/builder_config.py'
--- lib/offspring/builder_config.py	1970-01-01 00:00:00 +0000
+++ lib/offspring/builder_config.py	2011-11-04 21:07:25 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from offspring import config
+
+if __name__ == '__main__':
+    printed = set()
+    for key, value in config.config.items('builder'):
+        print 'IBS_%s="%s"' % (key.upper(), value)
+        printed.add(key)
+    for key, value in config.config.items('archiver'):
+        if key not in printed:
+            print 'IBS_%s="%s"' % (key.upper(), value)

=== modified file 'lib/offspring/config.py'
--- lib/offspring/config.py	2010-11-29 08:27:24 +0000
+++ lib/offspring/config.py	2011-11-04 21:07:25 +0000
@@ -26,6 +26,11 @@
         sys.stderr.write("Fatal Error: Unable to parse configuration file '%s'. (%s)\n" \
             % (CONFIGFILE_PATH, e) )
         sys.exit(1)
+    else:
+        hostname = os.popen('hostname').read().strip()
+        config.set('DEFAULT', 'hostname', hostname)
+        config.set('DEFAULT', 'username', os.environ['USERNAME'])
+        config.read([CONFIGFILE_PATH + '.' + hostname])
     finally:
         if configFile is not None:
             configFile.close()

=== modified file 'setup.py'
--- setup.py	2010-12-01 19:15:54 +0000
+++ setup.py	2011-11-04 21:07:25 +0000
@@ -10,6 +10,7 @@
     package_dir={'': 'lib'},
     packages=find_packages('lib'),
     scripts = [
+        'lib/offspring/build/bin/offspring-builder-config',
         'lib/offspring/slave/bin/offspring-slave',
         'lib/offspring/master/bin/offspring-master',
         'lib/offspring/web/bin/offspring-web',