Merge remote branch 'cros/upstream' into tempbranch3

tko/parsers/version_1.py

Index: tko/parsers/version_1.py
diff --git a/tko/parsers/version_1.py b/tko/parsers/version_1.py
index e231fd1b816b2c2681d9333a595957839287575f..111f7efaf6ade54bcbb98bf648c838be939bf96c 100644
--- a/tko/parsers/version_1.py
+++ b/tko/parsers/version_1.py
@@ -285,9 +285,14 @@ class parser(base.parser):
                 subdir_stack.append(line.subdir)
                 continue
             elif line.type == "INFO":
+                fields = line.optional_fields
                 # update the current kernel if one is defined in the info
-                if "kernel" in line.optional_fields:
+                if "kernel" in fields:
                     current_kernel = line.get_kernel()
+                # update the SERVER_JOB reason if one was logged for an abort
+                if "job_abort_reason" in fields:
+                    running_job.reason = fields["job_abort_reason"]
+                    new_tests.append(running_job)
                 continue
             elif line.type == "STATUS":
                 # update the stacks
@@ -385,7 +390,7 @@ class parser(base.parser):
 
         # the job is finished, produce the final SERVER_JOB entry and exit
         final_job = test.parse_test(self.job, "----", "SERVER_JOB",
-                                    self.job.exit_status(), "",
+                                    self.job.exit_status(), running_job.reason,
                                     current_kernel,
                                     self.job.started_time,
                                     self.job.finished_time,