From patchwork Wed Oct 24 21:23: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: 12485 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 4DF4923F9B for ; Wed, 24 Oct 2012 21:23:14 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id D24BFA183C9 for ; Wed, 24 Oct 2012 21:23:13 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so736767iag.11 for ; Wed, 24 Oct 2012 14:23: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=FadOemdJhX7XjNWmjayTFcpHSo2FAJeSxnwNJ4pLlYY=; b=A5z8MNvmPNFvSTaiTN7bKOxo4B8+8qLvyMGdTAvlVdda6o10WCRwOnYIyaFOtgASA6 E17tUeMNjmeq2QNQdyel4BAkmmPVIaJLnIKyRTuWBPEE9l0TT60AnZL26tYKjOBSKql7 J9jgqxMCdaBHc99ajMJ0SfbL8eSs6Do1X6I10PKtJ8xIfzZcE65dveU0fpVdOR3v2/F7 qNOCCGUKMj2PQj9DKJAG/YrUrO23vumnciF6d7RYVR4nTq0czrtMHMESajGgVFBEdoyA 2CQpaHCX4IyUOfM5VP1OQie9tNIWI8IVNGKmsTtPcwl5NSwLvZp+R94MKyHlfbwCkH1+ nmJg== Received: by 10.50.140.97 with SMTP id rf1mr2417427igb.70.1351113793197; Wed, 24 Oct 2012 14:23: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.67.148 with SMTP id n20csp685605igt; Wed, 24 Oct 2012 14:23:12 -0700 (PDT) Received: by 10.180.87.74 with SMTP id v10mr8666263wiz.21.1351113791864; Wed, 24 Oct 2012 14:23:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id db10si3774501wib.3.2012.10.24.14.23.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 14:23:11 -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 1TR8Pv-00010K-2U for ; Wed, 24 Oct 2012 21:23:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id E060EE0421 for ; Wed, 24 Oct 2012 21:23: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: 420 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 420: add a dummy_deployment action to allow dispatcher testing without having to do the time consuming... Message-Id: <20121024212310.7529.61679.launchpad@ackee.canonical.com> Date: Wed, 24 Oct 2012 21:23: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="16179"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 55bcfba42250ff6b1d59b1d7d364778d1050da37 X-Gm-Message-State: ALoCoQkN4FJ2SAFKK5J062bx/yK5FNqt123EXCFpHyPmeG5SYYToSvvP9CwfJIRBcWoOdbsPt41j Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/dummy-deployment/+merge/131126 proposed by: Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 420 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Thu 2012-10-25 10:15:01 +1300 message: add a dummy_deployment action to allow dispatcher testing without having to do the time consuming deploy each time removed: lava_dispatcher/actions/android_deploy.py renamed: lava_dispatcher/actions/lava-android-test.py => lava_dispatcher/actions/lava_android_test.py lava_dispatcher/actions/lava-test.py => lava_dispatcher/actions/lava_test.py modified: lava_dispatcher/actions/deploy.py 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 === removed file 'lava_dispatcher/actions/android_deploy.py' --- lava_dispatcher/actions/android_deploy.py 2012-09-30 17:01:44 +0000 +++ lava_dispatcher/actions/android_deploy.py 1970-01-01 00:00:00 +0000 @@ -1,39 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) 2011 Linaro Limited -# -# Author: Linaro Validation Team -# -# This file is part of LAVA Dispatcher. -# -# LAVA Dispatcher is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# LAVA Dispatcher is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . - -from lava_dispatcher.actions import BaseAction - - -class cmd_deploy_linaro_android_image(BaseAction): - - parameters_schema = { - 'type': 'object', - 'properties': { - 'boot': {'type': 'string'}, - 'system': {'type': 'string'}, - 'data': {'type': 'string'}, - 'rootfstype': {'type': 'string', 'optional': True, 'default': 'ext4'}, - }, - 'additionalProperties': False, - } - - def run(self, boot, system, data, rootfstype='ext4'): - self.client.deploy_linaro_android(boot, system, data, rootfstype) === modified file 'lava_dispatcher/actions/deploy.py' --- lava_dispatcher/actions/deploy.py 2012-09-30 17:01:44 +0000 +++ lava_dispatcher/actions/deploy.py 2012-10-24 01:34:07 +0000 @@ -72,3 +72,36 @@ def run(self, hwpack=None, rootfs=None, image=None, rootfstype='ext3'): self.client.deploy_linaro( hwpack=hwpack, rootfs=rootfs, image=image, rootfstype=rootfstype) + + +class cmd_deploy_linaro_android_image(BaseAction): + + parameters_schema = { + 'type': 'object', + 'properties': { + 'boot': {'type': 'string'}, + 'system': {'type': 'string'}, + 'data': {'type': 'string'}, + 'rootfstype': {'type': 'string', 'optional': True, 'default': 'ext4'}, + }, + 'additionalProperties': False, + } + + def run(self, boot, system, data, rootfstype='ext4'): + self.client.deploy_linaro_android(boot, system, data, rootfstype) + + +class cmd_dummy_deploy(BaseAction): + + parameters_schema = { + 'type': 'object', + 'properties': { + 'type': {'type': 'string', 'enum':['ubuntu', 'oe', 'android']}, + }, + 'additionalProperties': False, + } + + def run(self, type): + device = self.client.target_device + device.boot_master_image() + device.deployment_data = device.target_map[type] === renamed file 'lava_dispatcher/actions/lava-android-test.py' => 'lava_dispatcher/actions/lava_android_test.py' === renamed file 'lava_dispatcher/actions/lava-test.py' => 'lava_dispatcher/actions/lava_test.py' === modified file 'lava_dispatcher/device/master.py' --- lava_dispatcher/device/master.py 2012-10-23 17:58:40 +0000 +++ lava_dispatcher/device/master.py 2012-10-24 01:43:42 +0000 @@ -69,8 +69,9 @@ Target.ubuntu_deployment_data['data_type'] = 'ubuntu' Target.oe_deployment_data['data_type'] = 'oe' self.target_map = { + 'android': Target.android_deployment_data, + 'oe': Target.oe_deployment_data, 'ubuntu': Target.ubuntu_deployment_data, - 'oe': Target.oe_deployment_data, } self.master_ip = None