WebRTC: Move Android bots with devices to the perf waterfall.

scripts/slave/recipe_modules/webrtc/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 recipe_engine.types import freeze
 from recipe_engine import recipe_api
 from . import builders
 from . import steps
 
 
@@ skipping 76 matching lines @@
 
   @property
   def should_test(self):
     return self.bot_type in ('tester', 'builder_tester')
 
   @property
   def should_upload_build(self):
     return self.bot_config.get('triggers')
 
   @property
+  def should_upload_apprtcmobile(self):
+    return self.bot_config.get('archive_apprtc')
+
+  @property
   def should_download_build(self):
     return self.bot_config.get('parent_buildername')
 
   def apply_bot_config(self, builders, recipe_configs, perf_config=None):
     self.mastername = self.m.properties.get('mastername')
     self.buildername = self.m.properties.get('buildername')
     master_dict = builders.get(self.mastername, {})
     self.master_config = master_dict.get('settings', {})
     perf_config = self.master_config.get('PERF_CONFIG')
 
@@ skipping 105 matching lines @@
     """Add a suite of test steps.
 
     Args:
       test_suite: The name of the test suite.
     """
     context = {}
     if self._working_dir:
       context['cwd'] = self._working_dir
 
     with self.m.step.context(context):
-      if self.should_download_build and self.c.use_isolate:
-        self.m.isolate.find_isolated_tests(self.m.chromium.output_dir,
-                                           self._isolated_targets)
       tests = steps.generate_tests(self, self.c.TEST_SUITE, self.revision,
                                    self.c.enable_swarming)
       with self.m.step.defer_results():
         if tests:
           run_android_device_steps = (not self.c.enable_swarming and
               self.m.chromium.c.TARGET_PLATFORM == 'android' and
               self.c.TEST_SUITE != 'android_swarming')
 
           if run_android_device_steps:
             self.m.chromium_android.common_tests_setup_steps()
@@ skipping 76 matching lines @@
   def package_build(self):
     upload_url = self.m.archive.legacy_upload_url(
         self.master_config.get('build_gs_bucket'),
         extra_url_components=self.mastername)
     self.m.archive.zip_and_upload_build(
         'package build',
         self.m.chromium.c.build_config_fs,
         upload_url,
         build_revision=self.revision)
 
+  def package_apprtcmobile(self):
     # Zip and upload out/{Debug,Release}/apks/AppRTCMobile.apk
-    if self.bot_config.get('archive_apprtc', False):
-      apk_root = self.m.chromium.c.build_dir.join(
-          self.m.chromium.c.build_config_fs, 'apks')
-      zip_path = self.m.path['slave_build'].join('AppRTCMobile_apk.zip')
+    apk_root = self.m.chromium.c.build_dir.join(
+        self.m.chromium.c.build_config_fs, 'apks')
+    zip_path = self.m.path['slave_build'].join('AppRTCMobile_apk.zip')
 
-      pkg = self.m.zip.make_package(apk_root, zip_path)
-      pkg.add_file(apk_root.join('AppRTCMobile.apk'))
-      pkg.zip('AppRTCMobile zip archive')
+    pkg = self.m.zip.make_package(apk_root, zip_path)
+    pkg.add_file(apk_root.join('AppRTCMobile.apk'))
+    pkg.zip('AppRTCMobile zip archive')
 
-      apk_upload_url = 'client.webrtc/%s/AppRTCMobile_apk_%s.zip' % (
-          self.buildername, self.revision_number)
-      self.m.gsutil.upload(zip_path, 'chromium-webrtc', apk_upload_url,
-                           args=['-a', 'public-read'], unauthenticated_url=True)
+    apk_upload_url = 'client.webrtc/%s/AppRTCMobile_apk_%s.zip' % (
+        self.buildername, self.revision_number)
+    self.m.gsutil.upload(zip_path, 'chromium-webrtc', apk_upload_url,
+                         args=['-a', 'public-read'], unauthenticated_url=True)
 
   def extract_build(self):
     if not self.m.properties.get('parent_got_revision'):
       raise self.m.step.StepFailure(
          'Testers cannot be forced without providing revision information. '
          'Please select a previous build and click [Rebuild] or force a build '
          'for a Builder instead (will trigger new runs for the testers).')
 
     # Ensure old build directory isn't being used by removing it.
     self.m.file.rmtree(
@@ skipping 21 matching lines @@
   def clean_test_output(self):
     """Remove all test output in out/, since we have tests leaking files."""
     out_dir = self.m.path['checkout'].join('out')
     self.m.python('clean test output files',
                   script=self.resource('cleanup_files.py'),
                   args=[out_dir],
                   infra_step=True)
 
   def virtual_webcam_check(self):
     self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py'))