Allowing zip_build to use a file name given in build_url.

scripts/slave/zip_build.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.
 
 """ Creates a zip file in the staging dir with the result of a compile.
     It can be sent to other machines for testing.
 """
 
 import csv
@@ skipping 181 matching lines @@
 def MakeVersionedArchive(zip_file, file_suffix, options):
   """Takes a file name, e.g. /foo/bar.zip and an extra suffix, e.g. _baz,
   and copies (or hardlinks) the file to /foo/bar_baz.zip.
 
   Returns: A tuple containing three elements: the base filename, the extension
      and the full versioned filename."""
   zip_template = os.path.basename(zip_file)
   zip_base, zip_ext = os.path.splitext(zip_template)
   # Create a versioned copy of the file.
   versioned_file = zip_file.replace(zip_ext, file_suffix + zip_ext)
+  # Allow for overriding the name of the file based on the given upload url.
+  if options.override_archive_name:
+    new_build_url, new_archive_name = options.build_url.rsplit('/', 1)
+    if new_archive_name and new_archive_name.endswith('.zip'):
+      options.build_url = new_build_url
+      versioned_file = zip_file.replace(zip_template, new_archive_name)
   if os.path.exists(versioned_file):
     # This file already exists. Maybe we are doing a clobber build at the same
     # revision. We can move this file away.
     old_file = versioned_file.replace(zip_ext, '_old' + zip_ext)
     chromium_utils.MoveFile(versioned_file, old_file)
   if chromium_utils.IsWindows():
     shutil.copyfile(zip_file, versioned_file)
   else:
     os.link(zip_file, versioned_file)
   chromium_utils.MakeWorldReadable(versioned_file)
   print 'Created versioned archive', versioned_file
   return (zip_base, zip_ext, versioned_file)
 
 
 def UploadToGoogleStorage(versioned_file, revision_file, build_url, gs_acl,
                           gsutil_py_path=None):
+
   override_gsutil = None
   if gsutil_py_path:
     override_gsutil = [sys.executable, gsutil_py_path]
 
   if slave_utils.GSUtilCopyFile(versioned_file, build_url, gs_acl=gs_acl,
                                 override_gsutil=override_gsutil):
     raise chromium_utils.ExternalError(
         'gsutil returned non-zero status when uploading %s to %s!' %
         (versioned_file, build_url))
   print 'Successfully uploaded %s to %s' % (versioned_file, build_url)
@@ skipping 198 matching lines @@
                            help='The revision the archive should be at. '
                                 'Overrides the revision found on disk.')
   option_parser.add_option('--webkit_revision',
                            help='The revision of webkit the build is at. '
                                 'Overrides the revision found on disk.')
   option_parser.add_option('--exclude-unmatched', action='store_true',
                            help='Exclude all files not matched by a whitelist')
   option_parser.add_option('--build-url', default='',
                            help=('Optional URL to which to upload build '
                                  '(overrides build_url factory property)'))
+  option_parser.add_option('--override-archive-name', action='store_true',

[martiniss, 2016/07/06 21:28:47]

Maybe name this '--use-build-url-name' instead? Override makes me think I can
specify the name, but I actually can't. 

[RobertoCN, 2016/07/06 22:06:49]

Done.

+                           help=('Use the filename given in --build-url instead'
+                                 'of generating one.'))
   option_parser.add_option('--cros-board',
                            help=('If building for Chrom[e|ium]OS via the '
                                  'simple chrome workflow, the name of the '
                                  'target CROS board.'))
   option_parser.add_option('--package-dsym-files', action='store_true',
                            default=False, help='Add also dSYM files.')
   option_parser.add_option('--append-deps-patch-sha', action='store_true')
   option_parser.add_option('--gs-acl')
   option_parser.add_option('--json-urls',
                            help=('Path to json file containing uploaded '
@@ skipping 41 matching lines @@
       json.dump(urls, json_file)
   else:  # we need to print buildbot annotations
     if 'storage_url' in urls:
       print '@@@STEP_LINK@download@%s@@@' % urls['storage_url']
     if 'zip_url' in urls:
       print '@@@SET_BUILD_PROPERTY@build_archive_url@"%s"@@@' %  urls['zip_url']
   return 0
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))