diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2012-05-24 13:52:02 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2012-05-24 13:52:02 +0300 |
| commit | 5f38fafa264b0fef39e2cfebdca4e6fc35b2a66b (patch) | |
| tree | a80d80bb9be264d1f77e2ca69be343fda685a07c /control | |
| parent | 1fae45bbe0a7057b79e211fff8788dda3a4f4fec (diff) | |
Move plugin list to sandbox-create.conf, support more than one plugin.
Diffstat (limited to 'control')
| -rw-r--r-- | control/sandbox-create.conf | 4 | ||||
| -rwxr-xr-x | control/setup-control-node | 10 | ||||
| -rwxr-xr-x | control/setup-control-node-via-ssh | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/control/sandbox-create.conf b/control/sandbox-create.conf index 6574101..ae64bbe 100644 --- a/control/sandbox-create.conf +++ b/control/sandbox-create.conf @@ -38,3 +38,7 @@ 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:~pfalcon/linaro-android-build-tools/sandbox-plugins" + +PLUGINS_LATEST="http://updates.jenkins-ci.org/latest/ec2.hpi" +PLUGINS_CURRENT="http://updates.jenkins-ci.org/download/plugins/ec2/1.14/ec2.hpi" +PLUGINS="$PLUGINS_LATEST" diff --git a/control/setup-control-node b/control/setup-control-node index 483cbc7..ed8de47 100755 --- a/control/setup-control-node +++ b/control/setup-control-node @@ -9,6 +9,7 @@ ############################################################################### set -xe +. sandbox-create.conf MYPATH=$PWD/`dirname $0` HOSTNAME=$1 [ -z "$HOSTNAME" ] && HOSTNAME=`hostname` @@ -44,9 +45,14 @@ f = open(sys.argv[1], "w") f.write(etree.tostring(tree, xml_declaration=True, encoding='UTF-8')) f.close() EOF -# Install EC2 plugin + +# Install EC2 plugins sudo mkdir -p ~jenkins/plugins/ -sudo wget --no-check-certificate http://updates.jenkins-ci.org/latest/ec2.hpi -O ~jenkins/plugins/ec2.hpi +cd ~jenkins/plugins/ +for url in $PLUGINS; do + sudo wget $url || exit 1 +done + # Fix up perms sudo chmod a+xr ~jenkins sudo chown -R jenkins ~jenkins diff --git a/control/setup-control-node-via-ssh b/control/setup-control-node-via-ssh index ccc03fe..1ffcaf2 100755 --- a/control/setup-control-node-via-ssh +++ b/control/setup-control-node-via-ssh @@ -21,5 +21,6 @@ ssh -A $CRED <<EOF sudo apt-get install -y bzr rm -rf linaro-android-build-tools bzr clone $BRANCH linaro-android-build-tools - linaro-android-build-tools/control/setup-control-node $HOST + cd linaro-android-build-tools/control/ + ./setup-control-node $HOST EOF |