From patchwork Thu Oct 20 15:24:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 4749 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 53C3A23E04 for ; Thu, 20 Oct 2011 15:24:17 +0000 (UTC) Received: from mail-gx0-f180.google.com (mail-gx0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 19E06A1815F for ; Thu, 20 Oct 2011 15:24:17 +0000 (UTC) Received: by ggnv2 with SMTP id v2so4174436ggn.11 for ; Thu, 20 Oct 2011 08:24:16 -0700 (PDT) Received: by 10.223.17.3 with SMTP id q3mr18820767faa.28.1319124256276; Thu, 20 Oct 2011 08:24:16 -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.152.1.71 with SMTP id 7cs126677lak; Thu, 20 Oct 2011 08:24:15 -0700 (PDT) Received: by 10.227.178.141 with SMTP id bm13mr4683413wbb.33.1319124254693; Thu, 20 Oct 2011 08:24:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id b19si7245950wbh.20.2011.10.20.08.24.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Oct 2011 08:24:14 -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 1RGuTe-0003du-3z for ; Thu, 20 Oct 2011 15:24:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 147EDFAFB9 for ; Thu, 20 Oct 2011 15:24:14 +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: 143 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 143: Make the device_type a config item for the board type Message-Id: <20111020152414.28847.43390.launchpad@ackee.canonical.com> Date: Thu, 20 Oct 2011 15:24:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14165"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 169f2f08ac455a9dc5c408f55a90dee5599f70ee Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/dont-infer-lmc-name-for-board-bug-877045/+merge/79906 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Paul Larson (pwlars) ------------------------------------------------------------ revno: 143 [merge] committer: Paul Larson branch nick: lava-dispatcher timestamp: Thu 2011-10-20 10:20:56 -0500 message: Make the device_type a config item for the board type modified: lava_dispatcher/actions/deploy.py lava_dispatcher/client.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 'lava_dispatcher/actions/deploy.py' --- lava_dispatcher/actions/deploy.py 2011-10-20 10:19:30 +0000 +++ lava_dispatcher/actions/deploy.py 2011-10-20 15:20:56 +0000 @@ -165,7 +165,7 @@ cmd = ("sudo flock /var/lock/lava-lmc.lck linaro-media-create --hwpack-force-yes --dev %s " "--image-file %s --binary %s --hwpack %s --image-size 3G" % - (client.device_type, image_file, rootfs_path, hwpack_path)) + (client.lmc_dev_arg, image_file, rootfs_path, hwpack_path)) logging.info("Executing the linaro-media-create command") logging.info(cmd) rc, output = getstatusoutput(cmd) === modified file 'lava_dispatcher/client.py' --- lava_dispatcher/client.py 2011-10-20 14:49:29 +0000 +++ lava_dispatcher/client.py 2011-10-20 15:20:56 +0000 @@ -76,6 +76,10 @@ def default_network_interface(self): return self.device_option("default_network_interface") + @property + def lmc_dev_arg(self): + return self.device_option("lmc_dev_arg") + def in_master_shell(self, timeout=10): """ Check that we are in a shell on the master image """ === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2011-10-20 04:09:15 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2011-10-20 04:12:48 +0000 @@ -51,3 +51,8 @@ # The character the boot loader uses as a prompt on this board. bootloader_prompt = # + +# The argument to pass to --dev when invoking linaro-media-create +# Defaults to device_type because that's what was used before this +# option was introduced. +lmc_dev_arg = %(device_type)s