Merge lp:~qzhang/lava-dispatcher/add-tester_hostname into lp:lava-dispatcher

[Spring Zhang]

There is a requirement from community that user can define a different test image hostname other than "linaro".
The patch finishes master, qemu, fastmodel client.

[Andy Doan (doanac)]

thanks this should also help with bug: 1028512

review: Approve

[lp:~qzhang/lava-dispatcher/add-tester_hostname]

363. By Spring Zhang on 2012-08-02

include bug fix info

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-07-22 22:11:31 +0000
+++ doc/changes.rst	2012-08-02 02:35:23 +0000
@@ -1,11 +1,13 @@
 Version History
 ***************
 
-.. _version_0_15:
+.. _version_0_16:
 
 Version 0.16
 ============
-* Unreleased
+* UnReleased
+* Fix #1028512, provide test image hostname custom option: tester_hostname.
+* Fix #1019630, possibility to set proxy error when sending serial port command.
 
 .. _version_0_15_2:
 

=== modified file 'lava_dispatcher/client/base.py'
--- lava_dispatcher/client/base.py	2012-08-01 15:41:23 +0000
+++ lava_dispatcher/client/base.py	2012-08-02 02:35:23 +0000
@@ -288,6 +288,10 @@
         return self.device_option("hostname")
 
     @property
+    def tester_hostname(self):
+        return self.device_option("tester_hostname", "linaro")
+
+    @property
     def tester_str(self):
         return self.device_option("TESTER_STR")
 

=== modified file 'lava_dispatcher/client/fastmodel.py'
--- lava_dispatcher/client/fastmodel.py	2012-07-24 03:59:15 +0000
+++ lava_dispatcher/client/fastmodel.py	2012-08-02 02:35:23 +0000
@@ -93,7 +93,8 @@
 
     def _customize_ubuntu(self):
         with image_partition_mounted(self._sd_image, self.root_part) as mntdir:
-            logging_system('sudo echo linaro > %s/etc/hostname' % mntdir)
+            logging_system('sudo echo %s > %s/etc/hostname'
+                % (self.tester_hostname, mntdir)
 
     def deploy_image(self, image, axf, is_android=False):
         self._axf = download_image(axf, self.context)

=== modified file 'lava_dispatcher/client/master.py'
--- lava_dispatcher/client/master.py	2012-07-27 12:15:47 +0000
+++ lava_dispatcher/client/master.py	2012-08-02 02:35:23 +0000
@@ -114,7 +114,8 @@
     # another hour to err on the side of caution.
     _deploy_tarball_to_board(session, rootfs, '/mnt/root', timeout=18000)
 
-    session.run('echo linaro > /mnt/root/etc/hostname')
+    session.run('echo %s > /mnt/root/etc/hostname'
+        % session._client.tester_hostname)
     #DO NOT REMOVE - diverting flash-kernel and linking it to /bin/true
     #prevents a serious problem where packages getting installed that
     #call flash-kernel can update the kernel on the master image

=== modified file 'lava_dispatcher/client/qemu.py'
--- lava_dispatcher/client/qemu.py	2012-07-21 22:56:42 +0000
+++ lava_dispatcher/client/qemu.py	2012-08-02 02:35:23 +0000
@@ -56,7 +56,8 @@
             image_file = download_image(image, self.context)
         self._lava_image = image_file
         with image_partition_mounted(self._lava_image, self.root_part) as mntdir:
-            logging_system('echo linaro > %s/etc/hostname' % mntdir)
+            logging_system('echo %s > %s/etc/hostname' % (self.tester_hostname,
+                mntdir))
 
     @contextlib.contextmanager
     def _mnt_prepared_for_qemu(self, mntdir):

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-07-07 05:37:29 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-08-02 02:35:23 +0000
@@ -81,6 +81,9 @@
 # Master image recognization string
 MASTER_STR = root@master
 
+# Test image hostname, set blank to get default value "linaro"
+tester_hostname =
+
 # Test image recognization string
 TESTER_STR = root@linaro