Merge lp:~le-chi-thu/lava-dispatcher/lava-test-url-option into lp:lava-dispatcher

[Le Chi Thu]

Added LAVA_TEST_URL option and use pip to install lava-test.

[Paul Larson (pwlars)]

This seems to depend on the logging branch, so I'll look at merging it after we have that. Otherwise, looks ok to me. It would be a nice touch to also add some info to the README about it, or possibly some examples of how to install it from other sources besides a bzr branch.

=== modified file 'lava_dispatcher/actions/lava-test.py'
--- lava_dispatcher/actions/lava-test.py	2011-09-10 03:24:21 +0000
+++ lava_dispatcher/actions/lava-test.py	2011-09-13 22:25:23 +0000
@@ -21,9 +21,11 @@
 # with this program; if not, see <http://www.gnu.org/licenses>.
 
 from datetime import datetime
+import logging
 import traceback
 from lava_dispatcher.actions import BaseAction
 from lava_dispatcher.client import OperationFailed
+from lava_dispatcher.config import get_config
 
 
 
@@ -63,9 +65,12 @@
     cmd = ('chroot /mnt/root apt-get -y install bzr usbutils python-apt '
         'python-setuptools python-simplejson lsb-release')
     client.run_cmd_master(cmd, timeout=2400)
-    client.run_cmd_master('chroot /mnt/root bzr branch lp:lava-test')
-    client.run_cmd_master(
-        'chroot /mnt/root sh -c "cd lava-test && python setup.py install"')
+    client.run_cmd_master("chroot /mnt/root apt-get -y install python-pip")
+
+    dispatcher_config = get_config("lava-dispatcher")
+    lava_test_url = dispatcher_config.get("LAVA_TEST_URL")
+    logging.debug("Installing %s with pip" % lava_test_url)
+    client.run_cmd_master('chroot /mnt/root pip install -e ' + lava_test_url)
 
     #Test if lava-test installed
     try:
@@ -107,7 +112,6 @@
 
         if install_python:
             for module in install_python:
-                client.run_cmd_master("chroot /mnt/root apt-get -y install python-pip")
                 client.run_cmd_master("chroot /mnt/root pip install -e " + module)
 
         if register:

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/lava-dispatcher.conf'
--- lava_dispatcher/default-config/lava-dispatcher/lava-dispatcher.conf	2011-09-08 23:35:05 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/lava-dispatcher.conf	2011-09-13 22:25:23 +0000
@@ -17,3 +17,5 @@
 # Location for caching downloaded artifacts such as hwpacks and images
 LAVA_CACHEDIR = /linaro/images/cache
 
+# The url point to the version of lava-test to be install with pip
+LAVA_TEST_URL = bzr+http://bazaar.launchpad.net/~linaro-validation/lava-test/trunk/#egg=lava-test