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

appengine/swarming/server/task_request.py

 # coding: utf-8
 # Copyright 2014 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.
 
 """Tasks definition.
 
 Each user request creates a new TaskRequest. The TaskRequest instance saves the
 metadata of the request, e.g. who requested it, when why, etc. It links to the
 actual data of the request in a TaskProperties. The TaskProperties represents
@@ skipping 208 matching lines @@
 
 def _validate_package_version(prop, value):
   """Validates a CIPD package version."""
   if not cipd.is_valid_version(value):
     raise datastore_errors.BadValueError(
         '%s must be a valid package version "%s"' % (prop._name, value))
 
 
 def _validate_package_path(_prop, path):
   """Validates a CIPD installation path."""
+  if not path:
+    raise datastore_errors.BadValueError(
+        'CIPD package path is required. Use "." to install to run dir.')
   _validate_rel_path('CIPD package path', path)
 
 
+def _validate_output_path(_prop, value):
+  """Validates a path for an output file."""
+  _validate_rel_path('output file', value)
+
+
 def _validate_rel_path(value_name, path):
   if not path:
     raise datastore_errors.BadValueError(
-        '%s is required. Use "." to install to run dir.' % value_name)
+        'No argument provided for %s.' % value_name)
   if '\\' in path:
     raise datastore_errors.BadValueError(
         '%s cannot contain \\. On Windows forward-slashes '
         'will be replaced with back-slashes.' % value_name)
   if '..' in path.split('/'):
     raise datastore_errors.BadValueError(
         '%s cannot contain "..".' % value_name)
   normalized = posixpath.normpath(path)
   if path != normalized:
     raise datastore_errors.BadValueError(
@@ skipping 196 matching lines @@
   # Bot controlled timeout for new bytes from the subprocess. If a subprocess
   # doesn't output new data to stdout for .io_timeout_secs, consider the command
   # timed out. Optional.
   io_timeout_secs = ndb.IntegerProperty(
       validator=_validate_timeout, indexed=False)
 
   # If True, the task can safely be served results from a previously succeeded
   # task.
   idempotent = ndb.BooleanProperty(default=False, indexed=False)
 
+  # A list of outputs expected. If empty, all files written to
+  # $(ISOLATED_OUTDIR) will be returned; otherwise, the files in this list
+  # will be added to those in that directory.
+  outputs = ndb.StringProperty(repeated=True, indexed=False,
+      validator=_validate_output_path)
+
   @property
   def is_terminate(self):
     """If True, it is a terminate request."""
     return (
         not self.commands and
         not self.command and
         self.dimensions.keys() == [u'id'] and
         not (self.inputs_ref and self.inputs_ref.isolated) and
         not self.env and
         not self.execution_timeout_secs and
@@ skipping 438 matching lines @@
   init_new_request(request, allow_high_priority)
   return request
 
 
 def validate_priority(priority):
   """Throws ValueError if priority is not a valid value."""
   if 0 > priority or MAXIMUM_PRIORITY < priority:
     raise datastore_errors.BadValueError(
         'priority (%d) must be between 0 and %d (inclusive)' %
         (priority, MAXIMUM_PRIORITY))