Second attempt at adding archive_layout_test_results to the blink trybots.

scripts/slave/recipes/blink_trybot.py

 # Copyright 2013 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.
 
 DEPS = [
   'chromium',
   'gclient',
   'json',
   'path',
   'properties',
@@ skipping 47 matching lines @@
 
 def GenSteps(api):
   api.chromium.set_config('blink')
   api.chromium.apply_config('trybot_flavor')
   api.gclient.set_config('blink_internal',
                          GIT_MODE=api.properties.get('GIT_MODE', False))
   api.step.auto_resolve_conflicts = True
 
   webkit_lint = api.path.build('scripts', 'slave', 'chromium',
                                'lint_test_files_wrapper.py')
+  archive_layout_test_results = api.path.build(
+    'scripts', 'slave', 'chromium', 'archive_layout_test_results.py')
   webkit_python_tests = api.path.build('scripts', 'slave', 'chromium',
                                        'test_webkitpy_wrapper.py')
+  results_dir = api.path.slave_build('layout-test-results')
 
 
   def BlinkTestsStep(with_patch):
     name = 'webkit_tests (with%s patch)' % ('' if with_patch else 'out')
     test = api.path.build('scripts', 'slave', 'chromium',
                           'layout_test_wrapper.py')
     args = ['--target', api.chromium.c.BUILD_CONFIG,
-            '-o', api.path.slave_build('layout-test-results'),
+            '-o', results_dir,
             '--build-dir', api.path.checkout(api.chromium.c.build_dir),
             api.json.test_results()]
     return api.chromium.runtests(test, args, name=name, can_fail_build=False,
                                  followup_fn=followup_fn)
 
   yield (
     api.gclient.checkout(),
     api.rietveld.apply_issue('third_party', 'WebKit'),
     api.chromium.runhooks(),
     api.chromium.compile(),
     api.python('webkit_lint', webkit_lint, [
       '--build-dir', api.path.checkout('out'),
       '--target', api.properties['build_config']]),
     api.python('webkit_python_tests', webkit_python_tests, [
       '--build-dir', api.path.checkout('out'),
       '--target', api.properties['build_config']
     ]),
     api.chromium.runtests('webkit_unit_tests'),
     api.chromium.runtests('weborigin_unittests'),
     api.chromium.runtests('wtf_unittests'),
   )
 
   yield BlinkTestsStep(with_patch=True)
   if api.step_history.last_step().retcode == 0:
     yield api.python.inline('webkit_tests', 'print "ALL IS WELL"')
     return
+  with_patch = api.step_history.last_step().json.test_results
 
-  with_patch = api.step_history.last_step().json.test_results
+  buildername = api.properties['buildername']
+  buildnumber = api.properties['buildnumber']
+  def archive_webkit_tests_results_followup(step_result):
+    fmt = "https://storage.googleapis.com/chromium-layout-test-archives/%s/%s/"
+    step_result.presentation.links['layout_test_results'] = fmt % (
+      buildername, buildnumber)
+
+  yield api.python(
+    'archive_webkit_tests_results',
+    archive_layout_test_results,
+    [
+      '--results-dir', results_dir,
+      '--build-dir', api.path.checkout(api.chromium.c.build_dir),
+      '--build-number', buildnumber,
+      '--builder-name', buildername,
+      '--gs-bucket', 'gs://chromium-layout-test-archives',
+    ] + api.json.property_args(),
+    followup_fn=archive_webkit_tests_results_followup
+  )
 
   yield (
     api.gclient.revert(),
     api.chromium.runhooks(),
     api.chromium.compile(),
     BlinkTestsStep(with_patch=False),
   )
   clean = api.step_history.last_step().json.test_results
 
   ignored_failures = set(clean.unexpected_failures)
@@ skipping 104 matching lines @@
       root='src/third_party/WebKit',
       GIT_MODE=False,
     ),
     'step_mocks': warn_on_flakey_data,
     'mock': {
       'platform': {
         'name': 'linux'
       }
     }
   }