Merge lp:~stylesen/lava-dispatcher/fix-bug-1224260 into lp:lava-dispatcher

[Senthil Kumaran S]

Fix bug #1224260 - split_multi_job makes assumptions about the job JSON that are not enforced by the schema.

Always do not assume we have logging_level specified in the job JSON.

[Neil Williams (codehelp)]

This change doesn't cover the second part of the bug which is the presence or lack of tags in the original submission which needs a change in scheduler.

I'll sort out the schema validation for this and #1224033 and to prevent similar bugs in the future.

Let's merge this part because it is still necessary.

review: Approve

[Senthil Kumaran S (stylesen)]

Hi Neil,

On Thursday 12 September 2013 01:17 PM, Neil Williams wrote:
> This change doesn't cover the second part of the bug which is the presence or lack of tags in the original submission which needs a change in scheduler.
>
> I'll sort out the schema validation for this and #1224033 and to prevent similar bugs in the future.
>
> Let's merge this part because it is still necessary.

I request you to check the following MP for scheduler related changes:

https://code.launchpad.net/~stylesen/lava-scheduler/fix-bug-1224260/+merge/185211

Thank You.
--
Senthil Kumaran
http://www.stylesen.org/
http://www.sasenthilkumaran.com/

=== modified file 'lava_dispatcher/actions/lava_test_shell.py'
--- lava_dispatcher/actions/lava_test_shell.py	2013-08-28 14:55:50 +0000
+++ lava_dispatcher/actions/lava_test_shell.py	2013-09-12 07:12:28 +0000
@@ -648,7 +648,9 @@
                     else:
                         fout.write("LAVA_TEST_BIN='%s/bin'\n" % target.deployment_data['lava_test_dir'])
                         fout.write("LAVA_MULTI_NODE_CACHE='%s'\n" % LAVA_MULTI_NODE_CACHE_FILE)
-                        if self.context.test_data.metadata['logging_level'] == 'DEBUG':
+                        logging_level = self.context.test_data.metadata.get(\
+                            'logging_level', None)
+                        if logging_level and logging_level == 'DEBUG':
                             fout.write("LAVA_MULTI_NODE_DEBUG='yes'\n")
                     fout.write(fin.read())
                     os.fchmod(fout.fileno(), XMOD)