From patchwork Thu Aug 2 23:09:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Doan X-Patchwork-Id: 10473 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 90A5623E56 for ; Thu, 2 Aug 2012 23:09:15 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2CAC6A19294 for ; Thu, 2 Aug 2012 23:09:15 +0000 (UTC) Received: by ghbz12 with SMTP id z12so104301ghb.11 for ; Thu, 02 Aug 2012 16:09:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=T4joAi2FNdFw/T1LAvadArv42JY/JHR7ZbWPvMt70FE=; b=lfBWbtMHYJuQ2085fMWc1dtJIns/aCPp7z2SJgjOzGnOrHjeSz8EdtwyQaMmPMb/Ng KGyMLBWlytEzABEJJt10jRoJjLCn8S+wF9t2Yxlk8wtDVLwcmf4vO6dWFd6KNsm5KQYy cVDDdVYhRHqt/14uWwcPo8SWA2SZv0l1AnCHQZUTiUCxH+r8NY+ZDjIUuGIOpGSCHJk/ fD8SEz7qgbgOxcZwZsWBKXZJR2viGNlqwqWFl4FBBh6skM5i6CsIWP/XNokdXd79EWGe kDZn7EirGB20vRvUnh0Ash3X6ScMNk/lmZKCt/w1TGTEGktFLoB6B2uE8VDQZP74YswK eQIQ== Received: by 10.42.54.133 with SMTP id r5mr6462135icg.9.1343948954236; Thu, 02 Aug 2012 16:09:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.87.40 with SMTP id u8csp283705igz; Thu, 2 Aug 2012 16:09:13 -0700 (PDT) Received: by 10.180.95.230 with SMTP id dn6mr8378589wib.0.1343948952301; Thu, 02 Aug 2012 16:09:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id z8si40211054wiw.40.2012.08.02.16.09.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Aug 2012 16:09:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Sx4Vz-0008VW-BP for ; Thu, 02 Aug 2012 23:09:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 45A52E0128 for ; Thu, 2 Aug 2012 23:09:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 362 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 362: allow test image hostname to be configurable Message-Id: <20120802230911.21293.63493.launchpad@ackee.canonical.com> Date: Thu, 02 Aug 2012 23:09:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15719"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: a4d8d22c833c52238b6b00b43abe1981ea3be8f8 X-Gm-Message-State: ALoCoQn8QF8QzLaF/4mRDakrdCR3AZCEUwfHefsBADR5eGL+AChZp2w91OM2mAsIvHUYftepUOFC Merge authors: Spring Zhang (qzhang) Related merge proposals: https://code.launchpad.net/~qzhang/lava-dispatcher/add-tester_hostname/+merge/117752 proposed by: Spring Zhang (qzhang) review: Approve - Andy Doan (doanac) ------------------------------------------------------------ revno: 362 [merge] committer: Andy Doan branch nick: lava-dispatcher timestamp: Thu 2012-08-02 18:05:20 -0500 message: allow test image hostname to be configurable modified: doc/changes.rst lava_dispatcher/client/base.py lava_dispatcher/client/fastmodel.py lava_dispatcher/client/master.py lava_dispatcher/client/qemu.py lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'doc/changes.rst' --- doc/changes.rst 2012-07-22 22:11:31 +0000 +++ doc/changes.rst 2012-08-02 02:33:34 +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-01 17:52:55 +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-01 17:52:55 +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-01 17:52:55 +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-01 17:52:55 +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-01 17:52:55 +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