From patchwork Wed May 23 04:06:10 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: 8894 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 5D11A23EB5 for ; Wed, 23 May 2012 04:06:13 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0CB01A18DF8 for ; Wed, 23 May 2012 04:06:12 +0000 (UTC) Received: by yenq6 with SMTP id q6so7511883yen.11 for ; Tue, 22 May 2012 21:06:12 -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=kCWy2WMChLTZ6nJbuxb1HP9SSSIYRUypxU+ntoXIfl8=; b=ZwAF/eAprKRP+IatH8Vu4dXNVRQIIqoeO6obOuyLrj6BK4cyjiWBos7Pp6wMYowtUN 8sODoKH067ymXN1XZdMY4INcZ2ghEKghc00UbOGYReAJpxlyFlAKZRaa0SJcrqKAgzwz ieWM+jfXz5qn9+Z5yUaEX9wlen7xuuSpUhYe7/D1ujqnkWw2rkIL1hz0/gM5xI0kJQ/6 5fmwgWxrg5AmGKdtCl26FtC8SSt4iVmq2D+bBrA+5Or4X0hWd7d/iaMmJCpscwqHeTHK j6ju5x45y6ayWicJtwtz+wZOT3S1OX7gOOZY0avj+1AZ4PCnWKuZNUKq25fA/UZA+HPO tHOw== Received: by 10.50.46.232 with SMTP id y8mr11104033igm.57.1337745972087; Tue, 22 May 2012 21:06:12 -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.35.72 with SMTP id o8csp413219ibd; Tue, 22 May 2012 21:06:11 -0700 (PDT) Received: by 10.180.83.197 with SMTP id s5mr5044406wiy.9.1337745970716; Tue, 22 May 2012 21:06:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id y5si18369739wiy.44.2012.05.22.21.06.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 22 May 2012 21:06:10 -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 1SX2pu-0007Uc-6M for ; Wed, 23 May 2012 04:06:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 27405E1446 for ; Wed, 23 May 2012 04:06:10 +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: 295 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 295: Added the config option LAVA_TEST_DEB, to allow the installation of lava-test with apt-get. (Rafa... Message-Id: <20120523040610.15511.8754.launchpad@ackee.canonical.com> Date: Wed, 23 May 2012 04:06:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15282"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: a57da0ba00474f1ba61c65b9d4be46de488e019a X-Gm-Message-State: ALoCoQlLVK/s4cNl5T87XC4ny7uF3PxIYh66fdpcu15iEapPuCdKf+G8tbyRnF2Ka21rx+uVwFxg Merge authors: Rafael Martins (rafaelmartins) Related merge proposals: https://code.launchpad.net/~rafaelmartins/lava-dispatcher/install-lava-test-with-apt-get/+merge/106867 proposed by: Rafael Martins (rafaelmartins) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 295 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Wed 2012-05-23 16:02:38 +1200 message: Added the config option LAVA_TEST_DEB, to allow the installation of lava-test with apt-get. (Rafael Martins) modified: doc/QUICKSTART lava_dispatcher/actions/lava-test.py lava_dispatcher/default-config/lava-dispatcher/lava-dispatcher.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 'doc/QUICKSTART' --- doc/QUICKSTART 2012-04-23 05:51:22 +0000 +++ doc/QUICKSTART 2012-05-22 17:52:40 +0000 @@ -102,6 +102,12 @@ $ cat ~/.config/lava-dispatcher/lava-dispatcher.conf LAVA_PROXY = http://192.168.88.77:3128/ +The dispatcher will use ``pip`` to install the lava-test package by default. +You may want to use ``apt-get`` to install a ``.deb`` package instead, and +will need to set the LAVA_TEST_DEB, with the name of the package:: + + $ cat ~/.config/lava-dispatcher/lava-dispatcher.conf + LAVA_TEST_DEB = lava-test You will need to add a configuration file for your device. It can be extremely simple, just identifying the type of the device:: === modified file 'lava_dispatcher/actions/lava-test.py' --- lava_dispatcher/actions/lava-test.py 2012-05-09 22:24:31 +0000 +++ lava_dispatcher/actions/lava-test.py 2012-05-22 17:52:40 +0000 @@ -33,14 +33,20 @@ #Install necessary packages for build lava-test cmd = ('apt-get -y --force-yes install ' 'bzr usbutils python-apt python-setuptools ' - 'python-simplejson lsb-release python-keyring') + 'python-simplejson lsb-release python-keyring ' + 'python-pip') session.run(cmd, timeout=2400) - session.run("apt-get -y --force-yes install python-pip") dispatcher_config = client.context.config - lava_test_url = dispatcher_config.get("LAVA_TEST_URL") - logging.debug("Installing %s with pip" % lava_test_url) - session.run('pip install -e ' + lava_test_url) + + lava_test_deb = dispatcher_config.get("LAVA_TEST_DEB", "") + if lava_test_deb != "": + logging.debug("Installing %s with apt-get" % lava_test_deb) + session.run("apt-get -y --force-yes install " + lava_test_deb) + else: + lava_test_url = dispatcher_config.get("LAVA_TEST_URL") + logging.debug("Installing %s with pip" % lava_test_url) + session.run('pip install -e ' + lava_test_url) #Test if lava-test installed session.run('which lava-test', timeout=60) === modified file 'lava_dispatcher/default-config/lava-dispatcher/lava-dispatcher.conf' --- lava_dispatcher/default-config/lava-dispatcher/lava-dispatcher.conf 2012-05-08 05:37:59 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/lava-dispatcher.conf 2012-05-22 17:52:40 +0000 @@ -29,9 +29,14 @@ # Messages with a lower number than LOGGING_LEVEL will be suppressed LOGGING_LEVEL = 20 -# The url point to the version of lava-test to be install with pip +# The url point to the version of lava-test to be install with pip (default) LAVA_TEST_URL = bzr+http://bazaar.launchpad.net/~linaro-validation/lava-test/trunk/#egg=lava-test +# The name of the lava-test package to be installed with apt-get +# Use this variable if you want to use apt-get instead of pip to install lava-test +# LAVA_TEST_DEB = lava-test +LAVA_TEST_DEB = + # The qemu command to use. Called 'default_qemu_binary' because we # want to allow testing custom qemu binaries soon. default_qemu_binary = qemu