diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2012-05-23 18:57:07 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2012-05-23 18:57:07 +0300 |
| commit | 8581cb7c9b70286faea0665acb4e9df6136822db (patch) | |
| tree | ee8355f7f1168e21d33641d412be5553a60075f1 /control | |
| parent | 43f94a0d0d1ae8101ca50fca02bdfa0a9e4fffd7 (diff) | |
Allow to override branch from which code check out for run-on-sandbox stage.
Diffstat (limited to 'control')
| -rwxr-xr-x | control/sandbox-create | 2 | ||||
| -rw-r--r-- | control/sandbox-create.conf | 4 | ||||
| -rwxr-xr-x | control/setup-control-node-via-ssh | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/control/sandbox-create b/control/sandbox-create index 774c3fb..55a91d4 100755 --- a/control/sandbox-create +++ b/control/sandbox-create @@ -29,7 +29,7 @@ fi ec2_start_instance "$1" "$AMI" "$INSTANCE_TYPE" "$SECURITY_GROUPS" "$AVAILABILITY_ZONE" echo "Instance ID: $instance_id" echo "Hostname: $instance_hostname" -./setup-control-node-via-ssh $instance_hostname +./setup-control-node-via-ssh $instance_hostname $BUILD_TOOLS_BRANCH if [ "$2" == "--config=linaro" ]; then # Make sure to pre-auth bazaar.launchpad.net, because otherwise diff --git a/control/sandbox-create.conf b/control/sandbox-create.conf index 489379b..fdc467f 100644 --- a/control/sandbox-create.conf +++ b/control/sandbox-create.conf @@ -34,3 +34,7 @@ AVAILABILITY_ZONE="us-east-1b" # ec2-authorize jenkins-master -p 22 # ec2-authorize jenkins-mirror -p 443 SECURITY_GROUPS="-g git-mirror -g jenkins-master" + +# Check out code to run on sandbox from this branch +# (overriding useful for development/testing) +BUILD_TOOLS_BRANCH="lp:linaro-android-build-tools" diff --git a/control/setup-control-node-via-ssh b/control/setup-control-node-via-ssh index d1dc61f..ccc03fe 100755 --- a/control/setup-control-node-via-ssh +++ b/control/setup-control-node-via-ssh @@ -12,6 +12,7 @@ set -xe HOST=$1 +BRANCH=$2 CRED=ubuntu@$HOST echo "Installing cloud-buildd on: $HOST" @@ -19,6 +20,6 @@ ssh -A $CRED <<EOF sudo apt-get update sudo apt-get install -y bzr rm -rf linaro-android-build-tools - bzr clone lp:linaro-android-build-tools + bzr clone $BRANCH linaro-android-build-tools linaro-android-build-tools/control/setup-control-node $HOST EOF |