From patchwork Mon Oct 1 22:19:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Doan X-Patchwork-Id: 11895 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 9C0FD23F5B for ; Mon, 1 Oct 2012 22:19:14 +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 35642A187A2 for ; Mon, 1 Oct 2012 22:19:14 +0000 (UTC) Received: by ieje10 with SMTP id e10so12888984iej.11 for ; Mon, 01 Oct 2012 15:19:13 -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=hgvpEENYABtiQYWevGPvmFjl96ZsfqnuPbeTDSgjyT8=; b=mFLuV8fS3VBQyACyCRFSHt2lTIXQcerhf8lAApFCrjFcUt4yKqOILLF0JCU0XHQ/r4 SwmPUodxd6rawBg6rTRUILvliVZ0NZ84UtzwCT12gxdpxk/cHfRFi1lbvJyUJbgm8Mnn jVu44YJx5bncUEL07DigaXrn6KVbWeqcUSybgUOVHb5g88FCt4iDDhJXrQLI8EBqMu+C IP2opgl+i2dnXJhY+8J+8av4wFDDH71Dm7OAMQcE1tWWmpprx8YyqC4NMmY4eftzkdiR 6hcXYxudKDN3PeSuedb/jn+bYR/JMfOthxOM9B2jWH5O7swijebL+44nMb5dGaO+i1gW o3Iw== Received: by 10.42.110.130 with SMTP id q2mr12484018icp.53.1349129953603; Mon, 01 Oct 2012 15:19:13 -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.50.184.232 with SMTP id ex8csp52171igc; Mon, 1 Oct 2012 15:19:12 -0700 (PDT) Received: by 10.180.85.99 with SMTP id g3mr17448695wiz.5.1349129952075; Mon, 01 Oct 2012 15:19:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id gw5si19959003wib.8.2012.10.01.15.19.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 15:19:12 -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 1TIoKV-0003p8-60 for ; Mon, 01 Oct 2012 22:19:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 1F8AEE098B for ; Mon, 1 Oct 2012 22:19:11 +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: 393 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 393: configglue bug fixes found while doing fastmodel.py testing Message-Id: <20121001221911.28336.22362.launchpad@ackee.canonical.com> Date: Mon, 01 Oct 2012 22:19:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16061"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 79e6141977773f896ae8c114ce84ee8e10842a7b X-Gm-Message-State: ALoCoQkyzngNqThCuk5xxB9nqO3EeEYw0uCYttxHTPdWFGX6J2J5OmOGyqxxA6akYOnNhRIsSKmk Merge authors: Andy Doan (doanac) ------------------------------------------------------------ revno: 393 [merge] committer: Andy Doan branch nick: lava-dispatcher timestamp: Mon 2012-10-01 17:15:53 -0500 message: configglue bug fixes found while doing fastmodel.py testing modified: lava_dispatcher/actions/lava-test.py lava_dispatcher/client/fastmodel.py lava_dispatcher/client/lmc_utils.py lava_dispatcher/config.py lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf lava_dispatcher/downloader.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/actions/lava-test.py' --- lava_dispatcher/actions/lava-test.py 2012-09-26 02:55:25 +0000 +++ lava_dispatcher/actions/lava-test.py 2012-09-27 21:59:57 +0000 @@ -75,15 +75,15 @@ self.context.any_device_bundles = True logging.info("Executing lava_test_run %s command" % test_name) with self.client.tester_session() as session: - session.run('mkdir -p %s' % self.context.lava_result_dir) + session.run('mkdir -p %s' % self.context.config.lava_result_dir) session.export_display() bundle_name = generate_bundle_file_name(test_name) if test_options != "": test_options = "-t '%s'" % test_options cmd = ('lava-test run %s %s -o %s/%s.bundle' % ( - test_name, test_options, self.context.lava_result_dir, - bundle_name)) + test_name, test_options, + self.context.config.lava_result_dir, bundle_name)) try: rc = session.run(cmd, timeout=timeout) except: @@ -142,7 +142,7 @@ with self.client.reliable_session() as session: - lava_proxy = self.client.context.lava_proxy + lava_proxy = self.context.config.lava_proxy if lava_proxy: session.run("sh -c 'export http_proxy=%s'" % lava_proxy) === modified file 'lava_dispatcher/client/fastmodel.py' --- lava_dispatcher/client/fastmodel.py 2012-09-26 02:41:46 +0000 +++ lava_dispatcher/client/fastmodel.py 2012-09-27 21:59:57 +0000 @@ -137,7 +137,7 @@ generate_android_image( 'vexpress-a9', self._boot, self._data, self._system, self._sd_image) - self._copy_axf(self.client.boot_part, 'linux-system-ISW.axf') + self._copy_axf(self.config.boot_part, 'linux-system-ISW.axf') self._customize_android() === modified file 'lava_dispatcher/client/lmc_utils.py' --- lava_dispatcher/client/lmc_utils.py 2012-09-26 02:41:46 +0000 +++ lava_dispatcher/client/lmc_utils.py 2012-09-27 21:59:57 +0000 @@ -21,7 +21,7 @@ :param hwpack_url: url of the Linaro hwpack to download :param rootfs_url: url of the Linaro image to download """ - logging.info("preparing to deploy on %s" % client.hostname) + logging.info("preparing to deploy on %s" % client.config.hostname) logging.info(" hwpack: %s" % hwpack_url) logging.info(" rootfs: %s" % rootfs_url) === modified file 'lava_dispatcher/config.py' --- lava_dispatcher/config.py 2012-09-26 03:04:37 +0000 +++ lava_dispatcher/config.py 2012-09-27 21:59:57 +0000 @@ -59,7 +59,7 @@ root_part = schema.IntOption() sdcard_part_android = schema.StringOption() sdcard_part_android_org = schema.StringOption() - soft_boot_cmd = schema.StringOption() + soft_boot_cmd = schema.StringOption(default="reboot") sys_part_android = schema.StringOption() sys_part_android_org = schema.StringOption() tester_hostname = schema.StringOption(default="linaro") @@ -88,6 +88,7 @@ class DispatcherSchema(schema.Schema): default_qemu_binary = schema.StringOption(default="qemu") lava_cachedir = schema.StringOption() + lava_cookies = schema.StringOption() lava_image_tmpdir = schema.StringOption() lava_image_url = schema.StringOption() lava_proxy = schema.StringOption() === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-09-27 19:44:01 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-10-01 22:15:53 +0000 @@ -111,7 +111,7 @@ qemu_drive_interface = sd # This is used for snowball soft reset fix, since the reboot command is hanging. -soft_boot_cmd = +soft_boot_cmd = reboot # This is for android build where the network is not up by default. 1 or 0 enable_network_after_boot_android = 1 === modified file 'lava_dispatcher/downloader.py' --- lava_dispatcher/downloader.py 2012-08-24 14:20:35 +0000 +++ lava_dispatcher/downloader.py 2012-09-27 21:59:57 +0000 @@ -133,7 +133,7 @@ ''' logging.info("Downloading image: %s" % url) if not imgdir: - imgdir = mkdtemp(dir=context.lava_image_tmpdir) + imgdir = mkdtemp(dir=context.config.lava_image_tmpdir) if delete_on_exit: atexit.register(shutil.rmtree, imgdir) @@ -150,7 +150,8 @@ else: raise Exception("Unsupported url protocol scheme: %s" % url.scheme) - with reader(url, context.lava_proxy, context.lava_cookies) as r: + cookies = context.config.lava_cookies + with reader(url, context.config.lava_proxy, cookies) as r: with _decompressor_stream(url, imgdir, decompress) as (writer, fname): bsize = 32768 buff = r.read(bsize)