Build server to r21

This commit is contained in:
Ciaran Gultnieks 2013-01-21 11:09:56 +00:00
parent 17c9e2f4e7
commit 1a71dbf745
2 changed files with 8 additions and 4 deletions

View file

@ -12,10 +12,10 @@ script "setup-android-sdk" do
user user user user
cwd "/tmp" cwd "/tmp"
code " code "
wget http://dl.google.com/android/android-sdk_r16-linux.tgz wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
tar zxvf android-sdk_r16-linux.tgz tar zxvf android-sdk_r21.0.1-linux.tgz
mv android-sdk-linux #{sdk_loc} mv android-sdk-linux #{sdk_loc}
rm android-sdk_r16-linux.tgz rm android-sdk_r21.0.1-linux.tgz
#{sdk_loc}/tools/android update sdk --no-ui -t platform-tool #{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
#{sdk_loc}/tools/android update sdk --no-ui -t tool #{sdk_loc}/tools/android update sdk --no-ui -t tool
" "

View file

@ -23,7 +23,11 @@ if os.path.exists(boxfile):
vagrant(['halt'], serverdir) vagrant(['halt'], serverdir)
print "Configuring build server VM" print "Configuring build server VM"
vagrant(['up'], serverdir) returncode, out, err = vagrant(['up'], serverdir)
if returncode != 0:
print "Failed to configure server"
print out
print err
print "Stopping build server VM" print "Stopping build server VM"
vagrant(['halt'], serverdir) vagrant(['halt'], serverdir)