Second attempt at adding archive_layout_test_results to the blink trybots.

scripts/slave/chromium/archive_layout_test_results.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A tool to archive layout test results generated by buildbots.
 
 Actual result files (*-actual.txt), but not results from simplified diff
 tests (*-simp-actual.txt) or JS-filtered diff tests (*-jsfilt.txt), will
 be included in the archive.
@@ skipping 126 matching lines @@
   print 'last change: %s' % last_change
   print 'build name: %s' % build_name
   print 'build number: %s' % build_number
   print 'host name: %s' % socket.gethostname()
 
   # Where to save layout test results.
   dest_parent_dir = os.path.join(config.Archive.www_dir_base,
       results_dir_basename.replace('-','_'), build_name)
   dest_dir = os.path.join(dest_parent_dir, last_change)
 
-  gs_bucket = options.factory_properties.get('gs_bucket', None)
-  if gs_bucket:
-    gs_base = '/'.join([gs_bucket, build_name, build_number])
-    gs_acl = options.factory_properties.get('gs_acl', None)
+  if options.gs_bucket:
+    gs_base = '/'.join([options.gs_bucket, build_name, build_number])
+    gs_acl = options.gs_acl

[Dirk Pranke, 2013/08/06 21:40:03]

Do we actually need gs_acl ? I don't think we're currently using it, unless it's
getting passed implicitly from some other factory_property? 

     slave_utils.GSUtilCopyFile(zip_file, gs_base, gs_acl=gs_acl)
     slave_utils.GSUtilCopyFile(full_results_json, gs_base, gs_acl=gs_acl)
     slave_utils.GSUtilCopyFile(failing_results_json, gs_base, gs_acl=gs_acl)
   else:
     slave_utils.MaybeMakeDirectoryOnArchiveHost(dest_dir)
     slave_utils.CopyFileToArchiveHost(zip_file, dest_dir)
     slave_utils.CopyFileToArchiveHost(full_results_json, dest_dir)
     slave_utils.CopyFileToArchiveHost(failing_results_json, dest_dir)
     # Not supported on Google Storage yet.
     _ArchiveFullLayoutTestResults(staging_dir, dest_parent_dir, diff_file_list,
                                   options)
   return 0
 
 
 def main():
   option_parser = optparse.OptionParser()
   option_parser.add_option('', '--build-dir', default='webkit',
                            help='path to main build directory (the parent of '
                                 'the Release or Debug directory)')
   option_parser.add_option('', '--results-dir',
                            help='path to layout test results, relative to '
                                 'the build_dir')
   option_parser.add_option('', '--builder-name',
                            default=None,
                            help='The name of the builder running this script.')
   option_parser.add_option('', '--build-number',
                            default=None,
                            help=('The build number of the builder running'
                                  'this script.'))
+  option_parser.add_option('', '--gs-bucket',
+                           default=None,
+                           help=('The google storage bucket to upload to. '
+                                 'If provided, this script will upload to gs '
+                                 'instead of the master.'))
+  option_parser.add_option('', '--gs-acl',
+                           default=None,
+                           help=('The ACL of the google storage files.'))
   chromium_utils.AddPropertiesOptions(option_parser)
   options, args = option_parser.parse_args()
+
+  # To continue supporting buildbot, initialize these from the
+  # factory_properties if they were not supplied on the command line.
+  if not options.gs_bucket:
+    options.gs_bucket = options.factory_properties.get('gs_bucket')
+  if not options.gs_acl:
+    options.gs_acl = options.factory_properties.get('gs_acl')
+
   return archive_layout(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(main())