From patchwork Thu Dec 13 22:22:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Doan X-Patchwork-Id: 13555 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 6371123FB4 for ; Thu, 13 Dec 2012 22:22:19 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id E40FEA1836F for ; Thu, 13 Dec 2012 22:22:18 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so4911104ieb.11 for ; Thu, 13 Dec 2012 14:22:18 -0800 (PST) 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=jUEVushuCy77w01ZuhW2y76jD0lXi09W01EzJm6g6ss=; b=kbEzhZbi4S2Zk/FCwb7OEbBvIt7PpOe2nkjXqyPOBlrM/VGiAlbjwZ2NICQGIRQDH8 god/WdYsNEW5rHWDdP2J5MKwPnqH9lALhjf42bnM8qvyd0Ww3W7jlcodcADD2rYmFqaL zenWiOwS5DDzcG+v8bEEwudJWvB2RQVZ5kjkxyIPcQwG5nXfC7hJmOxXF74jF5ciZSIM bLpd62+ELfQNpFlLlVwcIKZZlnimZ0vQKxDLwRElfbfklqf1iy3+8IGg+K1T7Wk5GNDG h6N1JaGhtJw92CxYrdgs1m1YJgSrEZKCtuJBfZ3H0j2aWpMWeTdGyGWhEcx9p98nZnVK Nz2w== Received: by 10.50.187.197 with SMTP id fu5mr3227890igc.70.1355437338183; Thu, 13 Dec 2012 14:22:18 -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.50.67.148 with SMTP id n20csp38989igt; Thu, 13 Dec 2012 14:22:17 -0800 (PST) Received: by 10.180.19.99 with SMTP id d3mr5891425wie.4.1355437336557; Thu, 13 Dec 2012 14:22:16 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id wk8si620729wjc.41.2012.12.13.14.22.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 14:22:16 -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 1TjHAV-0000J5-Fd for ; Thu, 13 Dec 2012 22:22:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 6E5ACE014E for ; Thu, 13 Dec 2012 22:22: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: 496 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 496: clean up master's _update_uInitrd_partitions logic Message-Id: <20121213222215.8186.44972.launchpad@ackee.canonical.com> Date: Thu, 13 Dec 2012 22:22:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16369"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 1f4d97a9b84d413a918a2f4db25d42f7c2757e5d X-Gm-Message-State: ALoCoQnPS5TFYYNuGSbBYOmqMuJujb+hrJRArCKZv3upRQ5MgNmTyfPU6uW0FnWYmjbk8asjkGSv ------------------------------------------------------------ revno: 496 committer: Andy Doan branch nick: android-fixes timestamp: Thu 2012-12-13 15:23:55 -0600 message: clean up master's _update_uInitrd_partitions logic There's code that tried one mmc block and let errors pass, and then tried another block. Instead, let's change to allow the proper block to be specified in config modified: lava_dispatcher/config.py lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf lava_dispatcher/device/master.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/config.py' --- lava_dispatcher/config.py 2012-12-13 20:02:55 +0000 +++ lava_dispatcher/config.py 2012-12-13 21:23:55 +0000 @@ -79,6 +79,8 @@ android_adb_over_tcp = schema.BoolOption(default=True) android_wait_for_home_screen = schema.BoolOption(default=True) android_home_screen_tries = schema.IntOption(default=100) + android_orig_block_device = schema.StringOption(default="mmcblk0") + android_lava_block_device = schema.StringOption(default="mmcblk0") class OptionDescriptor(object): === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2012-07-05 06:23:27 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2012-12-13 21:23:55 +0000 @@ -24,3 +24,5 @@ echo 0x01 > /sys/kernel/debug/ab8500/register-address echo 0x11 > /sys/kernel/debug/ab8500/register-value +android_orig_block_device = mmcblk1 +android_lava_block_device = mmcblk1 === modified file 'lava_dispatcher/device/master.py' --- lava_dispatcher/device/master.py 2012-12-06 14:14:14 +0000 +++ lava_dispatcher/device/master.py 2012-12-13 21:23:55 +0000 @@ -618,19 +618,16 @@ sys_part_lava = session._client.config.sys_part_android data_part_lava = session._client.config.data_part_android - session.run( - 'sed -i "/\/dev\/block\/mmcblk0p%s/d" %s' - % (cache_part_org, rc_filename), failok=True) + # delete use of cache partition + session.run('sed -i "/\/dev\/block\/mmcblk0p%s/d" %s' + % (cache_part_org, rc_filename)) - session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" %s' - % (data_part_org, data_part_lava, rc_filename), failok=True) - session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" %s' - % (sys_part_org, sys_part_lava, rc_filename), failok=True) - # for snowball the mcvblk1 is used instead of mmcblk0. - session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" %s' - % (data_part_org, data_part_lava, rc_filename), failok=True) - session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" %s' - % (sys_part_org, sys_part_lava, rc_filename), failok=True) + blkorg = session._client.config.android_orig_block_device + blklava = session._client.config.android_lava_block_device + session.run('sed -i "s/%sp%s/%sp%s/g" %s' + % (blkorg, data_part_org, blklava, data_part_lava, rc_filename)) + session.run('sed -i "s/%sp%s/%sp%s/g" %s' + % (blkorg, sys_part_org, blklava, sys_part_lava, rc_filename)) def _recreate_uInitrd(session, target):