From patchwork Sun Mar 11 21:52: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: 7209 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 8204923E12 for ; Sun, 11 Mar 2012 21:52:13 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2A4C9A1834C for ; Sun, 11 Mar 2012 21:52:13 +0000 (UTC) Received: by iage36 with SMTP id e36so7574553iag.11 for ; Sun, 11 Mar 2012 14:52: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=shPHmPEt/1DfJSw+uy76qb/qbGdjXuwQoUaIRnoxg6M=; b=BrZTDuMnqcFLbiJhGsYOvRz95ZHsxDCW2XmrXRaLRSEQeQxbaBXfywMT0JfG2fIHNm XGuE0e/Lcohz9YHN9GUjZl5sMww8mwjnL402JxZWtHaf9w3ZZe2wdIPZLu5edsQVSrwZ ze9485Dz1dYnsFD1Gg/S+LZrSNRu4SMFtJlXJ07p/51g4AJ0YCXZ1UcppxIfSq/cvfY/ aG0dhT1K72jwgkgzBIchazbBe3PzDweqIYW3lT5NuiiNauN+KPmgczlxhMH4+Qu4RSy1 pwqfaUlM4U0bex4k6h+xfdEZ5HVjZCkfKQxjINuYuexDzeLQsSaSCj2Y47fWNPr4craz sVmA== Received: by 10.50.45.228 with SMTP id q4mr15530573igm.58.1331502732635; Sun, 11 Mar 2012 14:52: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.53.18 with SMTP id k18csp28543ibg; Sun, 11 Mar 2012 14:52:11 -0700 (PDT) Received: by 10.216.134.19 with SMTP id r19mr5839848wei.66.1331502730981; Sun, 11 Mar 2012 14:52:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id a7si12485235wix.26.2012.03.11.14.52.10 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Mar 2012 14:52: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 1S6qgU-00011F-D7 for ; Sun, 11 Mar 2012 21:52:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 58EA3E016F for ; Sun, 11 Mar 2012 21:52: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: 244 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 244: Nothing in the dispatcher has cared about the image_type field in the JSON for a while now, so st... Message-Id: <20120311215210.7152.63571.launchpad@ackee.canonical.com> Date: Sun, 11 Mar 2012 21:52: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="14914"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: e1efffe3b981b7205b1469902d6e4f769d0571b7 X-Gm-Message-State: ALoCoQldMAg18Levl1Kkhb1baZPwY6ViM+APPCWsLEgdtf7h73NQVIgQaP9/uCQja0spyozpBF8m Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/image_type-no-more/+merge/96694 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Spring Zhang (qzhang) ------------------------------------------------------------ revno: 244 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Mon 2012-03-12 10:50:08 +1300 message: Nothing in the dispatcher has cared about the image_type field in the JSON for a while now, so stop reading it. modified: doc/changes.rst doc/examples/jobs/android-new-kernel.json doc/examples/jobs/lava-android-test-leb-panda.json doc/jobfile.rst lava_dispatcher/context.py lava_dispatcher/job.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 'doc/changes.rst' --- doc/changes.rst 2012-03-08 21:31:03 +0000 +++ doc/changes.rst 2012-03-09 01:18:19 +0000 @@ -9,6 +9,7 @@ * Increase wget connect timeout to see if we can work around a possible issue where the server gets busy, and doesn't connect quickly enough for getting the tarballs +* Stop reading the long-obsolete 'image_type' field from the job json. .. _version_0_5_6: === modified file 'doc/examples/jobs/android-new-kernel.json' --- doc/examples/jobs/android-new-kernel.json 2011-12-22 06:11:18 +0000 +++ doc/examples/jobs/android-new-kernel.json 2012-03-09 01:18:19 +0000 @@ -1,6 +1,5 @@ { "job_name": "android_new_kernel", - "image_type": "android", "target": "panda01", "timeout": 18000, "actions": [ === modified file 'doc/examples/jobs/lava-android-test-leb-panda.json' --- doc/examples/jobs/lava-android-test-leb-panda.json 2011-12-22 06:11:18 +0000 +++ doc/examples/jobs/lava-android-test-leb-panda.json 2012-03-09 01:18:19 +0000 @@ -1,6 +1,5 @@ { "job_name": "android_monkey_test2", - "image_type": "android", "target": "panda01", "timeout": 18000, "actions": [ === modified file 'doc/jobfile.rst' --- doc/jobfile.rst 2011-10-27 00:21:45 +0000 +++ doc/jobfile.rst 2012-03-09 01:18:19 +0000 @@ -85,7 +85,6 @@ { "job_name": "android_new_kernel", - "image_type": "android", "target": "panda01", "timeout": 18000, "actions": [ @@ -140,7 +139,6 @@ { "job_name": "android_monkey_test2", - "image_type": "android", "target": "panda01", "timeout": 18000, "actions": [ === modified file 'lava_dispatcher/context.py' --- lava_dispatcher/context.py 2012-02-26 19:59:04 +0000 +++ lava_dispatcher/context.py 2012-03-09 01:18:19 +0000 @@ -28,7 +28,7 @@ class LavaContext(object): - def __init__(self, target, image_type, dispatcher_config, oob_file, job_data): + def __init__(self, target, dispatcher_config, oob_file, job_data): self.config = dispatcher_config self.job_data = job_data device_config = get_device_config( === modified file 'lava_dispatcher/job.py' --- lava_dispatcher/job.py 2012-03-01 16:17:19 +0000 +++ lava_dispatcher/job.py 2012-03-09 01:18:19 +0000 @@ -58,9 +58,6 @@ 'job_name': { 'optional': True, }, - 'image_type': { - 'optional': True, - }, 'target': { 'optional': True, }, @@ -79,7 +76,7 @@ self.job_status = 'pass' self.load_job_data(job_json) self.context = LavaContext( - self.target, self.image_type, config, oob_file, self.job_data) + self.target, config, oob_file, self.job_data) def load_job_data(self, job_json): self.job_data = json.loads(job_json) @@ -95,10 +92,6 @@ except : return None - @property - def image_type(self): - return self.job_data.get('image_type') - def validate(self): schema = Schema(job_schema) validator = Validator()