Initial work towards public Android recipes

scripts/slave/recipes/chromium.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 = [
   'archive',
   'bot_update',
   'chromium',
+  'chromium_android',
   'gclient',
   'isolate',
   'json',
   'path',
   'platform',
   'properties',
   'python',
   'step_history',
 ]
 
@@ skipping 41 matching lines @@
     return []
 
 
 class GTestTest(object):
   def __init__(self, name, args=None, flakiness_dash=False):
     self.name = name
     self.args = args or []
     self.flakiness_dash = flakiness_dash
 
   def run(self, api):
+    if api.chromium.c.TARGET_PLATFORM == 'android':
+      return api.chromium_android.run_test_suite(self.name, self.args)
+
     return api.chromium.runtest(self.name,
                                 test_type=self.name,
                                 args=self.args,
                                 annotate='gtest',
                                 xvfb=True,
                                 parallel=True,
                                 flakiness_dash=self.flakiness_dash)
 
-  def compile_targets(self, _):
+  def compile_targets(self, api):
+    if api.chromium.c.TARGET_PLATFORM == 'android':
+      return [self.name + '_apk']
+
     return [self.name]
 
 
 class DynamicGTestTests(object):
   def __init__(self, buildername, flakiness_dash=True):
     self.buildername = buildername
     self.flakiness_dash = flakiness_dash
 
   @staticmethod
   def _canonicalize_test(test):
@@ skipping 624 matching lines @@
         'compile_targets': [
           'all',
         ],
         'tests': [
           DynamicGTestTests('Linux Clang (dbg)'),
         ],
         'testing': {
           'platform': 'linux',
         },
       },
+
+      'Android Builder (dbg)': {
+        'recipe_config': 'chromium_android',
+        'chromium_config_kwargs': {
+          'BUILD_CONFIG': 'Debug',
+          'TARGET_BITS': 32,
+          'TARGET_PLATFORM': 'android',
+        },
+        'android_config': 'main_builder',
+        'bot_type': 'builder',
+        'testing': {
+          'platform': 'linux',
+        },
+      },
+      'Android Tests (dbg)': {
+        'recipe_config': 'chromium_android',
+        'chromium_config_kwargs': {
+          'BUILD_CONFIG': 'Debug',
+          'TARGET_BITS': 32,
+          'TARGET_PLATFORM': 'android',
+        },
+        'bot_type': 'tester',
+        'parent_buildername': 'Android Builder (dbg)',
+        'android_config': 'tests_base',
+        'tests': [
+          GTestTest('base_unittests'),
+        ],
+        'testing': {
+          'platform': 'linux',
+        },
+      },
+
+      'Android Builder': {
+        'recipe_config': 'chromium_android',
+        'chromium_config_kwargs': {
+          'BUILD_CONFIG': 'Release',
+          'TARGET_BITS': 32,
+          'TARGET_PLATFORM': 'android',
+        },
+        'android_config': 'main_builder',
+        'bot_type': 'builder',
+        'testing': {
+          'platform': 'linux',
+        },
+      },
+      'Android Tests': {
+        'recipe_config': 'chromium_android',
+        'chromium_config_kwargs': {
+          'BUILD_CONFIG': 'Release',
+          'TARGET_BITS': 32,
+          'TARGET_PLATFORM': 'android',
+        },
+        'bot_type': 'tester',
+        'parent_buildername': 'Android Builder',
+        'android_config': 'tests_base',
+        'tests': [
+          GTestTest('base_unittests'),
+        ],
+        'testing': {
+          'platform': 'linux',
+        },
+      },
     },
   },
   'chromium.mac': {
     'settings': {
       'build_gs_bucket': 'chromium-mac-archive',
     },
     'builders': {
       'Mac Builder': {
         'recipe_config': 'chromium',
         'chromium_config_kwargs': {
@@ skipping 731 matching lines @@
   'chromeos_official': {
     'chromium_config': 'chromium_official',
     'chromium_apply_config': ['chromeos'],
     'gclient_config': 'chromium',
     'gclient_apply_config': ['chrome_internal'],
   },
   'chromium': {
     'chromium_config': 'chromium',
     'gclient_config': 'chromium',
   },
+  'chromium_android': {
+    'chromium_config': 'android',
+    'gclient_config': 'chromium',
+    'gclient_apply_config': ['android'],
+  },
   'chromium_clang': {
     'chromium_config': 'chromium_clang',
     'gclient_config': 'chromium',
   },
   'chromium_chromeos': {
     'chromium_config': 'chromium',
     'chromium_apply_config': ['chromeos'],
     'gclient_config': 'chromium',
   },
   'chromium_chromeos_clang': {
@@ skipping 33 matching lines @@
   if bot_config.get('use_isolate'):
     api.isolate.set_isolate_environment(api.chromium.c)
   for c in recipe_config.get('chromium_apply_config', []):
     api.chromium.apply_config(c)
   for c in bot_config.get('chromium_apply_config', []):
     api.chromium.apply_config(c)
   api.gclient.set_config(recipe_config['gclient_config'])
   for c in recipe_config.get('gclient_apply_config', []):
     api.gclient.apply_config(c)
 
+  if 'android_config' in bot_config:
+    api.chromium_android.set_config(
+        bot_config['android_config'],
+        **bot_config.get('chromium_config_kwargs', {}))

[Michael Achenbach, 2014/05/28 14:23:27]

Not totally sure how much sense it makes to add the chromium_config_kwargs to
the android_config. Most of the variables are different. Well, BUILD_CONFIG is
the same. But it makes it a bit difficult to follow what goes from where to
where.

[Paweł Hajdan Jr., 2014/05/30 09:49:00]

Yes, android build is quite messy. It seems to me the first step would be
migrating everything to recipes, so it's easier to refactor all these things.

+
   if api.platform.is_win:
     yield api.chromium.taskkill()
 
   # Bot Update re-uses the gclient configs.
   yield api.bot_update.ensure_checkout(),
   if not api.step_history.last_step().json.output['did_run']:
     yield api.gclient.checkout(),
   # Whatever step is run right before this line needs to emit got_revision.
   update_step = api.step_history.last_step()
   got_revision = update_step.presentation.properties['got_revision']
@@ skipping 27 matching lines @@
       compile_targets.update(test.compile_targets(api))
     for builder_dict in master_dict.get('builders', {}).itervalues():
       if builder_dict.get('parent_buildername') == buildername:
         for test in builder_dict.get('tests', []):
           compile_targets.update(test.compile_targets(api))
     steps.extend([
         api.chromium.compile(targets=sorted(compile_targets)),
         api.chromium.checkdeps(),
     ])
 
+    if api.chromium.c.TARGET_PLATFORM == 'android':
+      steps.extend([
+          api.chromium_android.checklicenses(),
+          api.chromium_android.findbugs(),
+      ])
+
   if bot_type == 'builder':
     steps.append(api.archive.zip_and_upload_build(
         'package build',
         api.chromium.c.build_config_fs,
         api.archive.legacy_upload_url(
           master_config.get('build_gs_bucket'),
           extra_url_components=api.properties['mastername']),
         build_revision=got_revision))
 
   if bot_type == 'tester':
@@ skipping 12 matching lines @@
     steps.append(api.archive.download_and_unzip_build(
       'extract build',
       api.chromium.c.build_config_fs,
       api.archive.legacy_download_url(
         master_config.get('build_gs_bucket'),
         extra_url_components=api.properties['mastername'],),
       build_revision=got_revision,
       # TODO(phajdan.jr): Move abort_on_failure to archive recipe module.
       abort_on_failure=True))
 
+  if (api.chromium.c.TARGET_PLATFORM == 'android' and
+      bot_type in ['tester', 'builder_tester']):
+    steps.extend([
+        api.chromium_android.device_status_check(abort_on_failure=True),
+        api.chromium_android.provision_devices(abort_on_failure=True),
+    ])
+
   test_steps = [t.run(api) for t in bot_config.get('tests', [])]
   steps.extend(api.chromium.setup_tests(bot_type, test_steps))
 
   # For non-trybot recipes we should know (seed) all steps in advance,
   # at the beginning of each build. Instead of yielding single steps
   # or groups of steps, yield all of them at the end.
   yield steps
 
 
 def _sanitize_nonalpha(text):
@@ skipping 35 matching lines @@
     api.platform('linux', 64) +
     api.override_step_data('read test spec', api.json.output({
       'Linux Tests': {
         'gtest_tests': [
           'base_unittests',
           {'test': 'browser_tests', 'shard_index': 0, 'total_shards': 2},
         ],
       },
     }))
   )
+
+  yield (
+    api.test('findbugs_failure') +
+    api.properties.generic(mastername='chromium.linux',
+                           buildername='Android Builder (dbg)') +
+    api.platform('linux', 32) +
+    api.step_data('findbugs', retcode=1)
+  )