From patchwork Wed Apr 18 00:10:14 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: 7910 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 25D5123E47 for ; Wed, 18 Apr 2012 00:10:19 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id ABDBEA18075 for ; Wed, 18 Apr 2012 00:10:18 +0000 (UTC) Received: by iage36 with SMTP id e36so13205377iag.11 for ; Tue, 17 Apr 2012 17:10:18 -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=bDz+64RfvVENVXlwwHT+eDyMxkYzBaaAgY1Gpp8dVoU=; b=Gq8khuladuMDRgVy5KWw3w6ov+2ZTus0UidzqiRWVyD5BJHxxpZ+DvZ2pqPErDyemL 4oCr1UbMEQsdeqVcJUwt7itLpnBLKKzk979EFPiMI5YPZooP+K6wfA0dlS5D4fikOceV OdlwRNtkTeYNOxzpROaLnFSeSjIvZILCiJTbaZE2tB2HjaNghF/y86i/KtimhGeQ2I9Z qDKW0r/xs1h4389NHvdiygueszB32z6qfgCvTRxh/Peo4gnzbZe33AAyl0ZA2BwFQaJG 6Ql5iYYQJX8sD/htvYnCnbCSxK/LUiwQAsG0qsCPa2dmQOhoFa7RcqRpNX9KN5aoxKDm AQwA== Received: by 10.50.196.230 with SMTP id ip6mr97886igc.49.1334707818143; Tue, 17 Apr 2012 17:10:18 -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.231.137.198 with SMTP id x6csp182757ibt; Tue, 17 Apr 2012 17:10:17 -0700 (PDT) Received: by 10.180.98.8 with SMTP id ee8mr983567wib.14.1334707815991; Tue, 17 Apr 2012 17:10:15 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id s7si14152100wiw.14.2012.04.17.17.10.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 17:10:15 -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 1SKITO-0008BK-SW for ; Wed, 18 Apr 2012 00:10:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CDB59E015A for ; Wed, 18 Apr 2012 00:10: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: 275 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 275: allow overriding the command to stop the normal boot process and string to look for to know that ... Message-Id: <20120418001014.22748.51512.launchpad@ackee.canonical.com> Date: Wed, 18 Apr 2012 00:10: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="15099"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ac241d4b6cbdbe06b38162a7e98eda5a95b50d9a X-Gm-Message-State: ALoCoQkWtOgpaae6dGGsdQb2XXJ7BxpudgPOZ9CENL2BBfj3V+c0HA4a6oYN6EersSyxlWJPW1cL Merge authors: Abner Silva (abnerf) Related merge proposals: https://code.launchpad.net/~abnerf/lava-dispatcher/lava-dispatcher/+merge/102336 proposed by: Abner Silva (abnerf) review: Approve - Michael Hudson-Doyle (mwhudson) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 275 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Wed 2012-04-18 12:08:46 +1200 message: allow overriding the command to stop the normal boot process and string to look for to know that the boot process has begun from the device config modified: lava_dispatcher/client/master.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/client/master.py' --- lava_dispatcher/client/master.py 2012-04-02 11:36:56 +0000 +++ lava_dispatcher/client/master.py 2012-04-17 15:40:25 +0000 @@ -458,7 +458,8 @@ logging.info("Boot the system master image") self.soft_reboot() try: - self.proc.expect("Uncompressing Linux") + image_boot_msg = self.device_option('image_boot_msg') + self.proc.expect(image_boot_msg) self._in_master_shell(300) except: logging.exception("in_master_shell failed") @@ -651,7 +652,9 @@ def _enter_uboot(self): interrupt_boot_prompt = self.device_option('interrupt_boot_prompt') self.proc.expect(interrupt_boot_prompt) - self.proc.sendline("") + + interrupt_boot_command = self.device_option('interrupt_boot_command') + self.proc.sendline(interrupt_boot_command) def _boot_linaro_image(self): self._boot(string_to_list(self.config.get('boot_cmds'))) === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-03-26 11:46:50 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-04-17 15:40:25 +0000 @@ -85,6 +85,12 @@ # The string to look for to interrupt the boot process interrupt_boot_prompt = Hit any key to stop autoboot +# The string command to stop the normal boot process +interrupt_boot_command = "" + +# The string to look for to know that the boot process has begun +image_boot_msg = Uncompressing Linux + # The character the boot loader uses as a prompt on this board. bootloader_prompt = #