Upload retry summary to desired location instead of uploading then moving.

scripts/slave/chromium/archive_layout_test_retry_summary.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """This script is intended to archive retry summary results from
-try bot retries for layout tests along with layout test results.
+try bot retries of layout tests.
 
-The purpose if this is so that these retry results can be fetched
-from the same place that the first run results are fetched.
+By keeping these retry summary results in the same place as the
+layout test results from the first try (with patch), the retry
+results can be easily fetched from the same location as the results.
 """
 
+import argparse
 import logging
-import argparse
 import os
 import re
 import socket
+import shutil
 import sys
 
+from slave import robust_tempdir
 from slave import slave_utils
 
 
 def ArchiveRetrySummary(args):
   args.builder_name = re.sub('[ .()]', '_', args.builder_name)
   print 'Builder name: %s' % args.builder_name
   print 'Build number: %s' % args.build_number
   print 'Host name: %s' % socket.gethostname()
 
   gs_base = '/'.join([args.gs_bucket, args.builder_name, args.build_number])
-  slave_utils.GSUtilCopyFile(args.retry_summary_json,
-                             gs_base,
-                             cache_control="public, max-age=31556926")
-  slave_utils.GSUtilMoveFile(os.path.join(gs_base, args.retry_summary_json),
-                             os.path.join(gs_base, 'retry_summary.json'))
+  with robust_tempdir.RobustTempdir(prefix='retry-summary') as temp_dir:
+    temp_path = os.path.join(temp_dir, 'retry_summary.json')

[Paweł Hajdan Jr., 2016/10/24 12:07:18]

I'm wondering whether this works.

Could you explicitly call cleanup and tempdir methods of temp_dir? See how it's
used in remote_run.py .

As an alternative, if you're not using cleanup(), RobustTempdir probably doesn't
give you any advantage over plain tempfile.

[qyearsley, 2016/10/24 16:48:48]

Oh, I see -- robust_tempdir.RobustTempdir() gives you a base dir, and then the
normal usage is to clean up and make temp dirs inside of that base dir.

Makes sense, thanks.

+    shutil.copyfile(args.retry_summary_json, temp_path)
+    slave_utils.GSUtilCopyFile(temp_path, gs_base,

[Paweł Hajdan Jr., 2016/10/24 12:07:18]

Why do we copy to temporary directory for this?

It seems one could call GSUtilCopyFile right with args.retry_summary_json, and
make sure the destination on the GS side matches what we want.

[qyearsley, 2016/10/24 16:48:48]

The reason for this is that slave_utils.GSUtilCopyFile as-is doesn't let one
specify destination file name -- destination file name is the same was whatever
filename was passed in.

But I suppose this is an artificial limitation, and maybe it's OK to modify
slave_utils.GSUtilCopyFile to optionally take a destination file name?

+                               cache_control='public, max-age=31556926')
   return 0
 
 
 def _ParseArgs():
   parser = argparse.ArgumentParser()
   parser.add_argument('--retry-summary-json', type=str, required=True,
                       help='path to retry summary JSON file')
   parser.add_argument('--builder-name', type=str, required=True)
   parser.add_argument('--build-number', type=str, required=True)
   parser.add_argument('--gs-bucket', type=str, required=True)
   return parser.parse_args()
 
 
 def main():
   args = _ParseArgs()
   logging.basicConfig(level=logging.INFO,
                       format='%(asctime)s %(filename)s:%(lineno)-3d'
                              ' %(levelname)s %(message)s',
                       datefmt='%y%m%d %H:%M:%S')
   return ArchiveRetrySummary(args)
 
 
 if '__main__' == __name__:
   sys.exit(main())