commit ca76bcccd6b8029bb0c3fcf72b1c4649e7fad9b1
author Alex Miller <milleral@chromium.org> Fri Apr 18 18:47:28 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sun Apr 20 17:52:18 2014 +0000
tree 92c5f2bb135ff53a222c2c26d89b31e0521d63c7
parent 279d8a9f9dc0c51c40d029062167ab225a68abd5

[autotest] Pass --job-labels to cleanup.

Cleanup runs through a completely different flow from the rest of the
special tasks, so I missed it when threading things through the first
time...

BUG=chromium:334418
TEST=Logged job_labels from cleanup, saw labels

Change-Id: Ia7f78e6e3099f3d0ebddb777fc52e1f0cec984be
Reviewed-on: https://chromium-review.googlesource.com/195710
Tested-by: Alex Miller <milleral@chromium.org>
Reviewed-by: Prashanth B <beeps@chromium.org>
Commit-Queue: Alex Miller <milleral@chromium.org>

server/server_job.py

diff --git a/server/server_job.py b/server/server_job.py
index 652e28d..fa9c87f 100644
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -533,7 +533,8 @@
     def run(self, cleanup=False, install_before=False, install_after=False,
             collect_crashdumps=True, namespace={}, control=None,
             control_file_dir=None, verify_job_repo_url=False,
-            only_collect_crashinfo=False, skip_crash_collection=False):
+            only_collect_crashinfo=False, skip_crash_collection=False,
+            job_labels=''):
         # for a normal job, make sure the uncollected logs file exists
         # for a crashinfo-only run it should already exist, bail out otherwise
         created_uncollected_logs = False
@@ -564,7 +565,8 @@
 
         self.aborted = False
         namespace.update(self._make_namespace())
-        namespace.update({'args' : self.args})
+        namespace.update({'args' : self.args,
+                          'job_labels' : job_labels})
         test_start_time = int(time.time())
 
         if self.resultdir: