diff mbox

[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
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson March 11, 2012, 9:52 p.m. UTC 
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 <michael.hudson@linaro.org>
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
diff mbox

Patch

=== 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()