Merge remote branch 'cros/upstream' into master

server/server_job.py

Index: server/server_job.py
diff --git a/server/server_job.py b/server/server_job.py
index efc88d619816cb2f8e62ab0c4def92842e682771..8a16c6a4fdb06ba250149d459d29cfd9c34ccd30 100644
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -6,7 +6,7 @@ This is the core infrastructure. Derived from the client side job.py
 Copyright Martin J. Bligh, Andy Whitcroft 2007
 """
 
-import getpass, os, sys, re, stat, tempfile, time, select, subprocess
+import getpass, os, sys, re, stat, tempfile, time, select, subprocess, platform
 import traceback, shutil, warnings, fcntl, pickle, logging, itertools, errno
 from autotest_lib.client.bin import sysinfo
 from autotest_lib.client.common_lib import base_job
@@ -204,6 +204,7 @@ class base_server_job(base_job.base_job):
 
         job_data = {'label' : label, 'user' : user,
                     'hostname' : ','.join(machines),
+                    'drone' : platform.node(),
                     'status_version' : str(self._STATUS_VERSION),
                     'job_started' : str(int(time.time()))}
         if group_name: