Merge lp:~pfalcon/linaro-android-build-tools/apt-get-retry into lp:linaro-android-build-tools

[Paul Sokolovsky]

Retry apt-get operation in case of failure, protect build lsave setup against non-deterministic EC2 failures.

[James Tunnicliffe (dooferlad)]

Looks good.

review: Approve

=== modified file 'node/setup-build-android'
--- node/setup-build-android	2012-02-27 16:23:41 +0000
+++ node/setup-build-android	2012-03-01 16:07:41 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ###############################################################################
 # Copyright (c) 2011 Linaro
@@ -10,6 +10,22 @@
 
 set -xe
 
+# Stubborn apt-get, retrying on errors
+apt-get-retry () {
+    local delay=1;
+    while [ $delay -lt 100 ]; do
+        if apt-get "$@"; then
+            return
+        fi
+        echo "apt-get failed, sleeping ${delay}s before retrying"
+        sleep $delay
+        delay=$((delay * 2))
+    done
+    echo "apt-get failed after several attempts, aborting"
+    exit 1
+}
+
+
 # get latest repo script and install it in PATH
 #wget http://android.git.kernel.org/repo
 # Use our mirror of repo
@@ -20,13 +36,13 @@
 adduser --system jenkins-build
 
 sed -i.bk 's,^\(.*://[^.]*.ec2.archive.ubuntu.com\)/,\1.s3.amazonaws.com/,' /etc/apt/sources.list
-apt-get update
+apt-get-retry update
 
 # We do update as part of early node init (to get this script actually)
 #apt-get update
 
 # add feature to allow add-apt-repository
-apt-get install -y python-software-properties unixodbc java-common
+apt-get-retry install -y python-software-properties unixodbc java-common
 
 # enable partner repo for sun-java6
 ##add-apt-repository "deb http://archive.canonical.com/ubuntu maverick partner"
@@ -45,7 +61,7 @@
 
 # Install basic development packages
 # Do not install toolchains and other variable stuff here
-apt-get install -y \
+apt-get-retry install -y \
     zip \
     curl \
     texinfo \
@@ -55,7 +71,7 @@
     git-core
 
 # install base stuff for android
-apt-get install -y \
+apt-get-retry install -y \
 	gnupg \
 	gperf \
 	zlib1g-dev \