From patchwork Thu Feb 9 20:31:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 6732 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 382DD23EAE for ; Thu, 9 Feb 2012 20:31:13 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 02896A18668 for ; Thu, 9 Feb 2012 20:31:12 +0000 (UTC) Received: by yenr11 with SMTP id r11so1440776yen.11 for ; Thu, 09 Feb 2012 12:31:12 -0800 (PST) Received: by 10.50.156.133 with SMTP id we5mr31568451igb.12.1328819472335; Thu, 09 Feb 2012 12:31:12 -0800 (PST) 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.231.12.131 with SMTP id x3cs53329ibx; Thu, 9 Feb 2012 12:31:12 -0800 (PST) Received: by 10.180.107.68 with SMTP id ha4mr5100038wib.9.1328819471128; Thu, 09 Feb 2012 12:31:11 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id u51si2572519wec.40.2012.02.09.12.31.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Feb 2012 12:31:11 -0800 (PST) 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 1Rvae6-00028F-I5 for ; Thu, 09 Feb 2012 20:31:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 7F742E0801 for ; Thu, 9 Feb 2012 20:31:10 +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: 226 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 226: make qemu deployment work again Message-Id: <20120209203110.22670.62831.launchpad@ackee.canonical.com> Date: Thu, 09 Feb 2012 20:31:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14763"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: e4b78744b173eb272f393f066a809aaf64c54e05 X-Gm-Message-State: ALoCoQlY0LrXPAwyiWTi1LXjDC4s777dYJYUr1IbNnKwvCQZbg5Fvu6Qwvk488FiL9Axurw5lNBJ ------------------------------------------------------------ revno: 226 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Thu 2012-02-09 12:29:52 -0800 message: make qemu deployment work again modified: lava_dispatcher/client/qemu.py --- 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 'lava_dispatcher/client/qemu.py' --- lava_dispatcher/client/qemu.py 2011-12-19 01:44:12 +0000 +++ lava_dispatcher/client/qemu.py 2012-02-09 20:29:52 +0000 @@ -44,8 +44,11 @@ super(LavaQEMUClient, self).__init__(context, config) self._lava_image = None - def deploy_linaro(self, hwpack, rootfs, kernel_matrix=None, use_cache=True, rootfstype='ext3'): - image_file = generate_image(self, hwpack, rootfs, kernel_matrix, use_cache, rootfstype) + def deploy_linaro(self, hwpack=None, rootfs=None, image=None, kernel_matrix=None, use_cache=True, rootfstype='ext3'): + if image is None: + image_file = generate_image(self, hwpack, rootfs, kernel_matrix, use_cache, rootfstype) + else: + image_file = image 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)