Merge lp:~milo/linaro-ci/bug1034288 into lp:linaro-ci

[Milo Casagrande]

The MP adds a new function in the setup_lib bash file, in order to install more recent version of Linaro Image Tools.
Updated also the node scripts.

[Fathi Boudra (fboudra)]

Some minor fixes:
1) Add the function call where we need it (Oneiric/Precise node). Skip Natty node for now.
2) Rename install_lit to lit_install for consistency with live_build_install.
3) Call the function between live_build_install and git_config, to keep the packages installation block together.
4) VERSION should contains the debian version i.e. 2012.09.1-0ubuntu1~linaro1
5) use a single wget i.e. wget "${DOWNLOAD_URL}${DEB_FILE} ${DOWNLOAD_URL}${PYTHON_LIT}"

Thanks!

review: Needs Fixing

[lp:~milo/linaro-ci/bug1034288]

100. By Milo Casagrande on 2012-09-28

Removed installation of l-i-t from natty node.

101. By Milo Casagrande on 2012-09-28

Fixed version variable, wget line, and wrong variable use.

102. By Milo Casagrande on 2012-09-28

Renamed function, moved function calls in the nodes.

[Milo Casagrande (milo)]

Hi Fathi,

thanks for the review.

> Some minor fixes:
> 1) Add the function call where we need it (Oneiric/Precise node). Skip Natty
> node for now.
> 2) Rename install_lit to lit_install for consistency with live_build_install.
> 3) Call the function between live_build_install and git_config, to keep the
> packages installation block together.
> 4) VERSION should contains the debian version i.e. 2012.09.1-0ubuntu1~linaro1
> 5) use a single wget i.e. wget "${DOWNLOAD_URL}${DEB_FILE}
> ${DOWNLOAD_URL}${PYTHON_LIT}"

this is all done.
Just a note on the wget call: it needs to have two separate "strings" (wget "URL1" "URL2").

[Fathi Boudra (fboudra)]

+1

review: Approve

=== modified file 'node/setup-oneiric-node'
--- node/setup-oneiric-node	2012-08-07 14:37:21 +0000
+++ node/setup-oneiric-node	2012-09-28 07:06:18 +0000
@@ -28,6 +28,7 @@
               uboot-mkimage
 
 live_build_install
+lit_install
 git_config
 
 if test -e /tmp/fifo3; then
 
=== modified file 'node/setup-precise-node'
--- node/setup-precise-node	2012-08-16 04:56:33 +0000
+++ node/setup-precise-node	2012-09-28 07:06:18 +0000
@@ -55,6 +55,7 @@
               zsync
 
 live_build_install
+lit_install
 git_config
 
 if test -e /tmp/fifo3; then
 
=== modified file 'node/setup_lib'
--- node/setup_lib	2012-06-19 09:50:30 +0000
+++ node/setup_lib	2012-09-28 07:06:18 +0000
@@ -45,7 +45,19 @@
    git config --system http.proxy http://ci.linaro.org:3128
 }
 
-
+# Installs the correct linaro-image-tools and python-linaro-image-tools
+# versions.
+# The deb files are taken from the ubuntu-build-production archive:
+# https://launchpad.net/~linaro-infrastructure/+archive/ubuntu-build-production
+lit_install()
+{
+    VERSION='2012.09.1-0ubuntu1~linaro1'
+    DOWNLOAD_URL="https://launchpad.net/~linaro-infrastructure/+archive/ubuntu-build-production/+files/"
+    LIT_DEB="linaro-image-tools_${VERSION}_all.deb"
+    PYTHON_LIT="python-linaro-image-tools_${VERSION}_all.deb"
+    wget "${DOWNLOAD_URL}${LIT_DEB}" "${DOWNLOAD_URL}${PYTHON_LIT}"
+    dpkg -i ${LIT_DEB} ${PYTHON_LIT}
+}
 
 fifo_cleanup()
 {