Add --output option to Swarming client and pass it through to the bot

client/swarming.py

 #!/usr/bin/env python
 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Client tool to trigger tasks or retrieve results from a Swarming server."""
 
 __version__ = '0.8.7'

[M-A Ruel, 2016/10/26 18:47:32]

bump

 
 import collections
 import datetime
 import json
 import logging
 import optparse
 import os
 import subprocess
 import sys
 import threading
@@ skipping 149 matching lines @@
       'cipd_input',
       'command',
       'dimensions',
       'env',
       'execution_timeout_secs',
       'extra_args',
       'grace_period_secs',
       'idempotent',
       'inputs_ref',
       'io_timeout_secs',
+      'outputs',
     ])
 
 
 # See ../appengine/swarming/swarming_rpcs.py.
 NewTaskRequest = collections.namedtuple(
     'NewTaskRequest',
     [
       'expiration_secs',
       'name',
       'parent_task_id',
@@ skipping 765 matching lines @@
   parser.task_group.add_option(
       '--cipd-package', action='append', default=[],
       help='CIPD packages to install on the Swarming bot.  Uses the format: '
            'path:package_name:version')
   parser.task_group.add_option(
       '--service-account',
       help='Name of a service account to run the task as. Only literal "bot" '
            'string can be specified currently (to run the task under bot\'s '
            'account). Don\'t use task service accounts if not given '
            '(default).')
+  parser.task_group.add_option(
+      '-o', '--output', action='append', default=[],
+      help='A list of files to return in addition to those written to'
+           '$(ISOLATED_OUTDIR). An error will occur if a file specified by'
+           'this option is also written directly to $(ISOLATED_OUTDIR).')
   parser.add_option_group(parser.task_group)
 
 
 def process_trigger_options(parser, options, args):
   """Processes trigger options and does preparatory steps.
 
   Uploads files to isolate server and generates service account tokens if
   necessary.
   """
   options.dimensions = dict(options.dimensions)
@@ skipping 46 matching lines @@
   properties = TaskProperties(
       cipd_input=cipd_input,
       command=None if isolated_input else command,
       dimensions=options.dimensions,
       env=options.env,
       execution_timeout_secs=options.hard_timeout,
       extra_args=command if isolated_input else None,
       grace_period_secs=30,
       idempotent=options.idempotent,
       inputs_ref=inputs_ref,
-      io_timeout_secs=options.io_timeout)
+      io_timeout_secs=options.io_timeout,
+      outputs=options.output)
   if not all(len(t.split(':', 1)) == 2 for t in options.tags):
     parser.error('--tags must be in the format key:value')
 
   # Convert a service account email to a signed service account token to pass
   # to Swarming.
   service_account_token = None
   if options.service_account in ('bot', 'none'):
     service_account_token = options.service_account
   elif options.service_account:
     # pylint: disable=assignment-from-no-return
@@ skipping 597 matching lines @@
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserSwarming(version=__version__), args)
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))