Re-land: Switch GPU pixel tests to use cloud storage instead of the local disk.

scripts/slave/recipe_modules/gpu/api.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.
 
 from slave import recipe_api
 
 SIMPLE_TESTS_TO_RUN = [
   'content_gl_tests',
   'gles2_conform_test',
   'gl_tests',
@@ skipping 119 matching lines @@
       env['CHROME_DEVEL_SANDBOX'] = '/opt/chromium/chrome_sandbox'
 
     # Google Maps Pixel tests.
     yield self.run_telemetry_gpu_test('maps', name='maps_pixel_test',
         args=[
             '--generated-dir=%s' % self._generated_dir,
             '--build-revision=%s' % self._build_revision,
         ])
 
     # Pixel tests.
+    # Try servers pull their results from cloud storage; the other
+    # tester bots send their results to cloud storage.
+    #
+    # NOTE that ALL of the bots need to share a bucket. They can't be split
+    # by mastername/waterfall, because the try servers are on a different
+    # waterfall (tryserver.chromium) than the other test bots (chromium.gpu
+    # and chromium.webkit, as of this writing). This means there will be
+    # races between bots with identical OS/GPU combinations, on different
+    # waterfalls, attempting to upload results for new versions of each
+    # pixel test. If this is a significant problem in practice then we will
+    # have to rethink the cloud storage code in the pixel tests.
+    ref_img_arg = '--upload-refimg-to-cloud-storage'
+    if 'rietveld' in self.m.properties:
+      ref_img_arg = '--download-refimg-from-cloud-storage'
+    cloud_storage_bucket = 'chromium-gpu-archive/reference-images'
     yield self.run_telemetry_gpu_test('pixel_test',
         args=[
-            '--generated-dir=%s' % self._generated_dir,
-            '--reference-dir=%s' % self._reference_dir,
-            '--build-revision=%s' % self._build_revision,
+            '--build-revision',
+            str(self._build_revision),
+            ref_img_arg,
+            '--refimg-cloud-storage-bucket',
+            cloud_storage_bucket,
+            '--os-type',
+            self.m.chromium.c.TARGET_PLATFORM,
+            '--test-machine-name',
+            self.m.properties['buildername']
         ])
 
     # Archive telemetry pixel test results
     yield self.archive_pixel_test_results('archive_pixel_test_results',
         '%s_%s_telemetry' % (self._build_revision,
                              self.m.properties['buildername']),
         generated_dir=self._generated_dir,
         reference_dir=self._generated_dir) # This mismatch is intentional.
     # Reference images are copied into the generated directory upon failure
     # to ensure that they get archived with the correct name.
@@ skipping 68 matching lines @@
                                  platform_ext={'win': '.bat'})
 
     args = ['--run-id', run_id,
             '--generated-dir', generated_dir,
             '--gpu-reference-dir', reference_dir,
             '--gsutil', gsutil]
     return self.m.python(name,
                          self.m.path.build('scripts', 'slave', 'chromium',
                                            'archive_gpu_pixel_test_results.py'),
                          args, always_run=True)