summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Baker <tyler.baker@linaro.org>2014-11-24 22:21:56 (GMT)
committerNeil Williams <neil.williams@linaro.org>2014-11-25 09:24:36 (GMT)
commitab84c9502bd0b29a275117a7221df5021e31fe77 (patch)
treea963b6409a51f9fafb417b81b08d3bef75df77ec
parent32fd7ba4e3f81006761f906c80f4aea4799790ef (diff)
downloadlava-dispatcher-ab84c9502bd0b29a275117a7221df5021e31fe77.tar.gz
lava-dispatcher-ab84c9502bd0b29a275117a7221df5021e31fe77.tar.xz
lava-test-shell: detect deployed distro and boot accordinglyHEADmaster
Change-Id: Ic33c5e4e80f7839db05a6a3c0736a93b8f1f208d
-rw-r--r--lava_dispatcher/client/base.py5
-rw-r--r--lava_dispatcher/device/target.py4
2 files changed, 8 insertions, 1 deletions
diff --git a/lava_dispatcher/client/base.py b/lava_dispatcher/client/base.py
index 2c0b659..ef6c99d 100644
--- a/lava_dispatcher/client/base.py
+++ b/lava_dispatcher/client/base.py
@@ -416,7 +416,10 @@ class LavaClient(object):
just-booted system.
"""
- self.boot_linaro_image()
+ if self.target_device.target_distro != 'android':
+ self.boot_linaro_image()
+ else:
+ self.boot_linaro_android_image()
ps1_pattern = self.target_device.tester_ps1_pattern
ps1_includes_rc = self.target_device.tester_ps1_includes_rc
diff --git a/lava_dispatcher/device/target.py b/lava_dispatcher/device/target.py
index b8b2f6b..0aa5c10 100644
--- a/lava_dispatcher/device/target.py
+++ b/lava_dispatcher/device/target.py
@@ -716,6 +716,10 @@ class Target(object):
f.write('%s\n' % self.config.hostname)
@property
+ def target_distro(self):
+ return self.deployment_data['distro']
+
+ @property
def tester_ps1(self):
return self._get_from_config_or_deployment_data('tester_ps1')