Build server to r21

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 3689502f113a2b814ba75070ee91b4ee28f2019b..2d9ddc7574441ca2847ac5a34c3fa2b25de3ad82 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -12,10 +12,10 @@ script "setup-android-sdk" do
   user user
   cwd "/tmp"
   code "
-    wget http://dl.google.com/android/android-sdk_r16-linux.tgz
-    tar zxvf android-sdk_r16-linux.tgz
+    wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
+    tar zxvf android-sdk_r21.0.1-linux.tgz
     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 tool
   "

diff --git a/makebuildserver.py b/makebuildserver.py
index adaebbc3ff168ea8af38d5f4100d95265de0dff4..fbfeef87ddbda76e4e92963f788a1afe5261ace8 100755 (executable)
--- a/makebuildserver.py
+++ b/makebuildserver.py
@@ -23,7 +23,11 @@ if os.path.exists(boxfile):
 
 vagrant(['halt'], serverdir)
 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"
 vagrant(['halt'], serverdir)