Merge lp:~ricardokirkner/locolander/a-tree-full-of-scripts into lp:locolander

[Loco Lander]

initial set of scripts to run tests and merge branches

This branch adds:

- set of scripts:
  - run_project.sh: runs a container using docker and calls run_tests.sh for the source and target branches inside of that container
  - run_tests.sh: merges source into target branch and runs tests before pushing
  - build.sh: builds an image for a project, using a project specific Dockerfile

- Dockerfile for building the locolander:base image

[lp:~ricardokirkner/locolander/a-tree-full-of-scripts]

14. By Ricardo Kirkner on 2013-06-21

added support for passing commit message to run_tests.sh

15. By Ricardo Kirkner on 2013-06-22

handle arguments with spaces

16. By Ricardo Kirkner on 2013-06-22

commit after running tests

[Ricardo Kirkner (ricardokirkner)]

Looks good!

review: Approve ((by nessita))

=== modified file '.bzrignore'
--- .bzrignore	2013-06-21 20:26:50 +0000
+++ .bzrignore	2013-06-22 01:39:24 +0000
@@ -1,1 +1,2 @@
+docker/files/ssh
 locolander.db
 
=== added directory 'docker'
=== added file 'docker/Dockerfile'
--- docker/Dockerfile	1970-01-01 00:00:00 +0000
+++ docker/Dockerfile	2013-06-22 01:39:24 +0000
@@ -0,0 +1,42 @@
+from ubuntu:precise
+env http_proxy http://172.16.42.1:3128
+
+# enable universe repo
+run apt-get -y update
+run apt-get -y install python-software-properties
+run add-apt-repository "deb http://archive.ubuntu.com/ubuntu precise main universe"
+run apt-get -y update
+
+# install base tools
+run apt-get -y install python-pip
+run apt-get -y install bzr
+
+# upgrade system
+run apt-get -y upgrade
+
+# add pip cache
+run mkdir -p /var/cache/locolander/pip
+
+# configure proxy
+add ./files/environment /etc/environment
+add ./files/95proxies /etc/apt/apt.conf.d/95proxies
+
+# add locolander user
+run adduser locolander
+
+# install main locolander script
+add ./scripts/run_tests.sh /usr/local/bin/run_tests.sh
+run chown locolander.locolander /usr/local/bin/run_tests.sh
+
+# configure ssh
+run mkdir /home/locolander/.ssh
+add ./files/ssh/id_rsa /home/locolander/.ssh/id_rsa
+add ./files/ssh/id_rsa.pub /home/locolander/.ssh/id_rsa.pub
+
+# configure bazaar
+run mkdir /home/locolander/.bazaar
+add ./files/bazaar/bazaar.conf /home/locolander/.bazaar/bazaar.conf
+add ./files/bazaar/authentication.conf /home/locolander/.bazaar/authentication.conf
+
+# ensure proper ownership
+run chown -R locolander.locolander /home/locolander/
 
=== added directory 'docker/files'
=== added file 'docker/files/95proxies'
--- docker/files/95proxies	1970-01-01 00:00:00 +0000
+++ docker/files/95proxies	2013-06-22 01:39:24 +0000
@@ -0,0 +1,3 @@
+Acquire::http::proxy "http://172.16.42.1:3128/";
+Acquire::ftp::proxy "ftp://172.16.42.1:3128/";
+Acquire::https::proxy "https://172.16.42.1:3128/";
 
=== added directory 'docker/files/bazaar'
=== added file 'docker/files/bazaar/authentication.conf'
--- docker/files/bazaar/authentication.conf	1970-01-01 00:00:00 +0000
+++ docker/files/bazaar/authentication.conf	2013-06-22 01:39:24 +0000
@@ -0,0 +1,4 @@
+[Launchpad]
+host = .launchpad.net
+scheme = ssh
+user = locolander
 
=== added file 'docker/files/bazaar/bazaar.conf'
--- docker/files/bazaar/bazaar.conf	1970-01-01 00:00:00 +0000
+++ docker/files/bazaar/bazaar.conf	2013-06-22 01:39:24 +0000
@@ -0,0 +1,3 @@
+[DEFAULT]
+email = "Loco Lander"
+launchpad_username = locolander
 
=== added file 'docker/files/environment'
--- docker/files/environment	1970-01-01 00:00:00 +0000
+++ docker/files/environment	2013-06-22 01:39:24 +0000
@@ -0,0 +1,10 @@
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
+
+http_proxy=http://172.16.42.1:3128/
+https_proxy=http://172.16.42.1:3128/
+ftp_proxy=http://172.16.42.1:3128/
+no_proxy="localhost,127.0.0.1,localaddress,.localdomain.com"
+HTTP_PROXY=http://172.16.42.1:3128/
+HTTPS_PROXY=http://172.16.42.1:3128/
+FTP_PROXY=http://172.16.42.1:3128/
+NO_PROXY="localhost,127.0.0.1,localaddress,.localdomain.com"
 
=== added directory 'docker/scripts'
=== added file 'docker/scripts/build.sh'
--- docker/scripts/build.sh	1970-01-01 00:00:00 +0000
+++ docker/scripts/build.sh	2013-06-22 01:39:24 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+PROJECT=$1
+DOCKERFILE=$2
+
+docker build -t $PROJECT - < $DOCKERFILE
 
=== added file 'docker/scripts/run_project.sh'
--- docker/scripts/run_project.sh	1970-01-01 00:00:00 +0000
+++ docker/scripts/run_project.sh	2013-06-22 01:39:24 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PROJECT="$1"
+SOURCE="$2"
+TARGET="$3"
+CMD="$4"
+COMMIT_MSG="$5"
+
+OUTPUT=$(docker run -u locolander -e HOME=/home/locolander $PROJECT /usr/local/bin/run_tests.sh "$SOURCE" "$TARGET" "$CMD" "$COMMIT_MSG")
 
=== added file 'docker/scripts/run_tests.sh'
--- docker/scripts/run_tests.sh	1970-01-01 00:00:00 +0000
+++ docker/scripts/run_tests.sh	2013-06-22 01:39:24 +0000
@@ -0,0 +1,31 @@
+#!/bin/bash -e
+
+SOURCE="$1"
+TARGET="$2"
+CMD="$3"
+COMMIT_MSG="$4"
+
+TMPFOLDER=`mktemp -d`
+
+cd $TMPFOLDER
+echo "Getting target branch ($TARGET)..."
+bzr branch $TARGET target
+
+# merge
+echo "Merging source branch ($SOURCE) into target..."
+cd target
+bzr merge $SOURCE
+
+# run tests
+echo "Running tests..."
+$CMD
+
+# commit
+echo "Committing merge..."
+bzr commit -m "$COMMIT_MSG"
+
+# push merge
+echo "Pushing merge..."
+bzr push $TARGET
+
+echo "SUCCESS"