From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 21 Jan 2013 11:09:56 +0000 (+0000)
Subject: Build server to r21
X-Git-Tag: 0.1~702
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1a71dbf74566c8ccdd7543e4bf8bb8f9d49f5830;p=fdroidserver.git

Build server to r21
---

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 3689502f..2d9ddc75 100644
--- 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 adaebbc3..fbfeef87 100755
--- 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)