From patchwork Wed May 29 18:48:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baker X-Patchwork-Id: 17278 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f200.google.com (mail-ye0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03D2825B9B for ; Wed, 29 May 2013 18:48:17 +0000 (UTC) Received: by mail-ye0-f200.google.com with SMTP id r11sf7087542yen.3 for ; Wed, 29 May 2013 11:48:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :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:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=MSVQ9J6jP8jlksEjXqhTH40e6BsCzYEg3LqyxEQp/Ac=; b=o1OKckI7F3sxLq9c/D5bkD/O+iIR+4a7t2WOdJ5VeTUgt+XSwCRNoUw4L4UHurvouP 8/Np/i86p8BnesVj+/Of0I4M6Apa5HyGcYZ9qgMqZPu4dB+qkhDlCk+xT5fQGcZ40j+k 5mIFo0pmnhwBo9Y4aVuRXpgVcG1Jj7Nsh3xzpcDwKym9Xtfyba+rK/rA4wa5T1U9p00a zHkN7KdXupBBQCxIScLPEZJxh69oRCsKxAjgjzmEvG0onv9qnTmCjXlxSqSGe/Y3ijR8 SntC8fn32le2kkulSOEjDYP4bC0ITVwQMzUSlrYaDnCeZUfujvo0Z/el4T9WdmLODvG6 cRnw== X-Received: by 10.236.139.134 with SMTP id c6mr2182682yhj.7.1369853297790; Wed, 29 May 2013 11:48:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.106.73 with SMTP id gs9ls10347qeb.27.gmail; Wed, 29 May 2013 11:48:17 -0700 (PDT) X-Received: by 10.220.114.203 with SMTP id f11mr2496682vcq.21.1369853297574; Wed, 29 May 2013 11:48:17 -0700 (PDT) Received: from mail-vb0-x231.google.com (mail-vb0-x231.google.com [2607:f8b0:400c:c02::231]) by mx.google.com with ESMTPS id gr7si22373747vdc.77.2013.05.29.11.48.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 May 2013 11:48:17 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::231; Received: by mail-vb0-f49.google.com with SMTP id q13so4227389vbe.8 for ; Wed, 29 May 2013 11:48:17 -0700 (PDT) X-Received: by 10.220.112.16 with SMTP id u16mr2514719vcp.40.1369853297285; Wed, 29 May 2013 11:48:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.229.199 with SMTP id jj7csp24421vcb; Wed, 29 May 2013 11:48:16 -0700 (PDT) X-Received: by 10.14.224.201 with SMTP id x49mr5544860eep.14.1369853296091; Wed, 29 May 2013 11:48:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id r44si22037997eep.165.2013.05.29.11.48.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 May 2013 11:48:16 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UhlPz-0007st-BN for ; Wed, 29 May 2013 18:48:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 4091DE087A for ; Wed, 29 May 2013 18:48:15 +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: 613 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 613: Updates for new Highbank firmware Message-Id: <20130529184815.17387.79051.launchpad@ackee.canonical.com> Date: Wed, 29 May 2013 18:48:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16652"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: a12a916137fefc7165eef8731ac7e68abd0ec5a4 X-Gm-Message-State: ALoCoQk+EP6sWnEd6bQsqwXLqzYpOJFwQTSJqMmQ5MS7GG09f9wdN6N3lXcsk8zn+UnJYx7lVzE9 X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Tyler Baker (tyler-baker) Related merge proposals: https://code.launchpad.net/~tyler-baker/lava-dispatcher/highbank-updates/+merge/166349 proposed by: Tyler Baker (tyler-baker) review: Approve - Antonio Terceiro (terceiro) ------------------------------------------------------------ revno: 613 [merge] committer: Tyler Baker branch nick: lava-dispatcher-trunk timestamp: Wed 2013-05-29 11:47:20 -0700 message: Updates for new Highbank firmware modified: lava_dispatcher/device/highbank.py lava_dispatcher/ipmi.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/device/highbank.py' --- lava_dispatcher/device/highbank.py 2013-05-15 18:17:02 +0000 +++ lava_dispatcher/device/highbank.py 2013-05-29 18:36:04 +0000 @@ -232,21 +232,14 @@ @contextlib.contextmanager def _as_master(self): self.bootcontrol.power_on_boot_master() - - # Two reboots seem to be necessary to ensure that pxe boot is used. - # Need to identify the cause and fix it - self.proc.expect("Hit any key to stop autoboot:") - self.proc.sendline('') - self.bootcontrol.power_reset_boot_master() - self.proc.expect("\(initramfs\)") self.proc.sendline('export PS1="%s"' % self.MASTER_PS1) self.proc.expect(self.MASTER_PS1_PATTERN, timeout=180, lava_no_logging=1) runner = HBMasterCommandRunner(self) runner.run(". /scripts/functions") - device = "eth0" - runner.run("DEVICE=%s configure_networking" % device) + runner.run("DEVICE=%s configure_networking" % + self.config.default_network_interface) # we call dhclient even though configure_networking above already # picked up a IP address. configure_networking brings the interface up, === modified file 'lava_dispatcher/ipmi.py' --- lava_dispatcher/ipmi.py 2013-05-16 12:43:27 +0000 +++ lava_dispatcher/ipmi.py 2013-05-29 18:09:54 +0000 @@ -56,7 +56,6 @@ def reset(self): self.__ipmi("chassis power reset") - class IpmiPxeBoot(object): """ This class provides a convenient object-oriented API that can be @@ -70,16 +69,10 @@ def power_on_boot_master(self): self.ipmitool.set_to_boot_from_pxe() self.ipmitool.power_on() - self.ipmitool.reset() - - def power_reset_boot_master(self): - self.ipmitool.set_to_boot_from_pxe() - self.ipmitool.reset() def power_on_boot_image(self): self.ipmitool.set_to_boot_from_disk() self.ipmitool.power_on() - self.ipmitool.reset() def power_off(self): self.ipmitool.power_off()