WebRTC: Remove android_apk recipe

scripts/slave/recipes/webrtc/chromium.py

 # Copyright 2014 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.
 
 # Recipe for building Chromium and running WebRTC-specific tests with special
 # requirements that doesn't allow them to run in the main Chromium waterfalls.
 # Also provide a set of FYI bots that builds Chromium with WebRTC ToT to provide
 # pre-roll test results.
 
 DEPS = [
@@ skipping 45 matching lines @@
 
   # The chromium.webrtc.fyi master is used as an early warning system to catch
   # WebRTC specific errors before they get rolled into Chromium's DEPS.
   # Therefore this waterfall needs to build src/third_party/webrtc with WebRTC
   # ToT and use the Chromium HEAD. The revision poller is passing a WebRTC
   # revision for these recipes.
   if mastername == 'chromium.webrtc.fyi':
     s = api.gclient.c.solutions
     s[0].revision = 'HEAD'
 
-    # Revision to be used for SVN-based checkouts and passing builds between
-    # builders/testers.
-    # For forced builds, revision is empty, in which case we sync HEAD.
-    webrtc_revision = api.properties.get('revision', 'HEAD')
-    if webrtc_revision is None:
-      webrtc_revision = 'HEAD'
-
-    if bot_type == 'tester':
-      webrtc_revision = api.properties.get('parent_got_revision')
-      assert webrtc_revision, (
-         '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).')
-
     # Since bot_update uses separate Git mirrors for the webrtc and libjingle
     # repos, they cannot use the revision we get from the poller, since it won't
     # be present in both if there's a revision that only contains changes in one
     # of them. For now, work around this by always syncing HEAD for both.
     api.gclient.c.revisions.update({
         'src/third_party/webrtc': 'HEAD',
         'src/third_party/libjingle/source/talk': 'HEAD',
     })
 
   # Bot Update re-uses the gclient configs.
   step_result = api.bot_update.ensure_checkout(force=True)
   got_revision = step_result.presentation.properties['got_revision']
 
   if not bot_config.get('disable_runhooks'):
     api.chromium.runhooks()
 
   if bot_type in ('builder', 'builder_tester'):
     run_gn = api.chromium.c.project_generator.tool == 'gn'
     if run_gn:
       api.chromium.run_gn()
 
     compile_targets = recipe_config.get('compile_targets', [])
     api.chromium.compile(targets=compile_targets)
     if mastername == 'chromium.webrtc.fyi' and not run_gn:
       api.webrtc.sizes(got_revision)
 
+  archive_revision = api.properties.get('parent_got_revision', got_revision)
   if bot_type == 'builder' and bot_config.get('build_gs_archive'):
     api.webrtc.package_build(
-        api.webrtc.GS_ARCHIVES[bot_config['build_gs_archive']], got_revision)
+        api.webrtc.GS_ARCHIVES[bot_config['build_gs_archive']],
+        archive_revision)
 
   if bot_type == 'tester':
-    # Ensure old build directory is not used is by removing it.
-    api.path.rmtree(
-        'build directory',
-        api.chromium.c.build_dir.join(api.chromium.c.build_config_fs))
-
     api.webrtc.extract_build(
-        api.webrtc.GS_ARCHIVES[bot_config['build_gs_archive']], got_revision)
+        api.webrtc.GS_ARCHIVES[bot_config['build_gs_archive']],
+        archive_revision)
 
   if bot_type in ('builder_tester', 'tester'):
     api.webrtc.cleanup()
     if api.chromium.c.TARGET_PLATFORM == 'android':
       api.chromium_android.common_tests_setup_steps()
       api.chromium_android.run_test_suite(
           'content_browsertests',
           gtest_filter='WebRtc*')
       api.chromium_android.common_tests_final_steps()
     else:
       test_runner = lambda: api.webrtc.runtests(recipe_config.get('test_suite'),
                                                 revision=got_revision)
       api.chromium_tests.setup_chromium_tests(test_runner)
 
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text)
 
 
 def GenTests(api):
-  def generate_builder(mastername, buildername, bot_config, revision=None,
+  builders = api.webrtc.BUILDERS
+
+  def generate_builder(mastername, buildername, revision=None,
                        parent_got_revision=None, suffix=None):
     suffix = suffix or ''
+    bot_config = builders[mastername]['builders'][buildername]
     bot_type = bot_config.get('bot_type', 'builder_tester')
+
     if bot_type in ('builder', 'builder_tester'):
       assert bot_config.get('parent_buildername') is None, (
           'Unexpected parent_buildername for builder %r on master %r.' %
               (buildername, mastername))
     test = (
       api.test('%s_%s%s' % (_sanitize_nonalpha(mastername),
                             _sanitize_nonalpha(buildername), suffix)) +
       api.properties.generic(mastername=mastername,
                              buildername=buildername,
                              revision=revision,
                              parent_buildername=bot_config.get(
                                  'parent_buildername')) +
       api.platform(bot_config['testing']['platform'],
                    bot_config.get(
                        'chromium_config_kwargs', {}).get('TARGET_BITS', 64))
     )
     if bot_type == 'tester':
       parent_rev = parent_got_revision or revision
       test += api.properties(parent_got_revision=parent_rev)
     return test
 
   for mastername in ('chromium.webrtc', 'chromium.webrtc.fyi'):
-    master_config = api.webrtc.BUILDERS[mastername]
-    for buildername, bot_config in master_config['builders'].iteritems():
+    master_config = builders[mastername]
+    for buildername in master_config['builders'].keys():
       revision = '12345' if mastername == 'chromium.webrtc.fyi' else '321321'
-      yield generate_builder(mastername, buildername, bot_config, revision)
+      yield generate_builder(mastername, buildername, revision)
 
   # Forced build (not specifying any revision).
   mastername = 'chromium.webrtc'
   buildername = 'Linux Builder'
-  bot_config = api.webrtc.BUILDERS[mastername]['builders'][buildername]
-  yield generate_builder(mastername, buildername, bot_config, revision=None,
+  yield generate_builder(mastername, buildername, revision=None,
                          suffix='_forced')
 
+  buildername = 'Linux Tester'
+  yield generate_builder(mastername, buildername, revision=None,
+                         suffix='_forced_invalid')
+
   # Periodic scheduler triggered builds also don't contain revision.
   mastername = 'chromium.webrtc.fyi'
   buildername = 'Win Builder'
-  bot_config = api.webrtc.BUILDERS[mastername]['builders'][buildername]
-  yield generate_builder(mastername, buildername, bot_config, revision=None,
+  yield generate_builder(mastername, buildername, revision=None,
                          suffix='_periodic_triggered')
 
   # Testers gets got_revision value from builder passed as parent_got_revision.
   buildername = 'Win7 Tester'
-  bot_config = api.webrtc.BUILDERS[mastername]['builders'][buildername]
-  yield generate_builder(mastername, buildername, bot_config, revision=None,
+  yield generate_builder(mastername, buildername, revision=None,
                          parent_got_revision='12345',
                          suffix='_periodic_triggered')