Merge lp:~linaro-infrastructure/linaro-ci/lci-setup-script-additions into lp:linaro-ci

[Stevan Radaković]

Two more additions for setup script for Custom AMI switch on ci.l.o.
Setup proxy and do apt-get update.
Will not interfere with current slave setup.

[lp:~linaro-infrastructure/linaro-ci/lci-setup-script-additions]

82. By Stevan Radaković on 2012-07-04

Fix apt-get update line.

[Paul Sokolovsky (pfalcon)]

Looks good.

review: Approve

=== modified file 'node/setup-oneiric-node'
--- node/setup-oneiric-node	2012-07-02 13:52:43 +0000
+++ node/setup-oneiric-node	2012-07-04 09:00:45 +0000
@@ -9,6 +9,10 @@
 
 export DEBIAN_FRONTEND=noninteractive
 
+echo 'Acquire::http::Proxy "http://ci.linaro.org:3128";' > /etc/apt/apt.conf.d/ci_linaro_org_http_proxy
+
+apt-get-retry --non-fatal update
+
 # Install packages
 apt-get-retry install -y  build-essential \
               debootstrap \

=== modified file 'node/setup-precise-node'
--- node/setup-precise-node	2012-07-02 14:12:41 +0000
+++ node/setup-precise-node	2012-07-04 09:00:45 +0000
@@ -7,6 +7,11 @@
 set -xe
 
 . `dirname $0`/setup_lib
+
+echo 'Acquire::http::Proxy "http://ci.linaro.org:3128";' > /etc/apt/apt.conf.d/ci_linaro_org_http_proxy
+
+apt-get-retry --non-fatal update
+
 apt-get-retry install -y python-software-properties 
 add-apt-repository 'deb http://us.archive.ubuntu.com/ubuntu/ precise-backports main restricted universe'
 apt-get-retry --non-fatal update