Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: scripts/slave/recipes/webrtc/android_apk.py

Issue 505153002: WebRTC: Remove android_apk recipe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebased Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/webrtc/android_apk.py
diff --git a/scripts/slave/recipes/webrtc/android_apk.py b/scripts/slave/recipes/webrtc/android_apk.py
deleted file mode 100644
index 9195314a03a010de0f9bcb5017fd29ea5ca15a61..0000000000000000000000000000000000000000
--- a/scripts/slave/recipes/webrtc/android_apk.py
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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.
-
-DEPS = [
- 'archive',
- 'base_android',
- 'bot_update',
- 'chromium',
- 'chromium_android',
- 'gclient',
- 'json',
- 'path',
- 'platform',
- 'properties',
- 'python',
- 'step',
- 'tryserver',
- 'webrtc',
-]
-
-
-def GenSteps(api):
- mastername = api.properties.get('mastername')
- buildername = api.properties.get('buildername')
- master_dict = api.webrtc.BUILDERS.get(mastername, {})
- bot_config = master_dict.get('builders', {}).get(buildername)
- assert bot_config, ('Unrecognized builder name %r for master %r.' %
- (buildername, mastername))
- recipe_config_name = bot_config['recipe_config']
- recipe_config = api.webrtc.RECIPE_CONFIGS.get(recipe_config_name)
- assert recipe_config, ('Cannot find recipe_config "%s" for builder "%r".' %
- (recipe_config_name, buildername))
-
- # The infrastructure team has recommended not to use git yet on the
- # bots, but it's very nice to have when testing locally.
- # To use, pass "use_git=True" as an argument to run_recipe.py.
- use_git = api.properties.get('use_git', False)
-
- api.webrtc.set_config(recipe_config['webrtc_config'],
- GIT_MODE=use_git,
- **bot_config.get('webrtc_config_kwargs', {}))
- if api.tryserver.is_tryserver:
- api.webrtc.apply_config('webrtc_android_apk_try_builder')
-
- bot_type = bot_config.get('bot_type', 'builder_tester')
- does_build = bot_type in ('builder', 'builder_tester')
- does_test = bot_type in ('builder_tester', 'tester')
-
- # Replace src/third_party/webrtc with the specified revision and force the
- # Chromium code to sync ToT.
- 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.
- 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).')
- else:
- # For forced builds, revision is empty, in which case we sync HEAD.
- webrtc_revision = api.properties.get('revision', 'HEAD')
-
- # This is only used by SVN-based checkouts.
- # TODO(kjellander): Remove this when these bots are switched to bot_update.
- s[0].custom_vars['webrtc_revision'] = webrtc_revision
-
- # 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',
- })
-
- # TODO(tandrii,iannucci): Support webrtc.apply_svn_patch with bot_update.
- # crbug.com/376122
- # For now, ignore all patches in bot_update, and apply_svn_patch always.
- step_result = api.bot_update.ensure_checkout(patch=False)
-
- api.webrtc.cleanup()
-
- # Whatever step is run right before this line needs to emit got_revision.
- update_step = step_result
- got_revision = update_step.presentation.properties['got_revision']
-
- # Until crbug.com/376122 is resolved, run apply_svn_patch after bot_update.
- if does_build and api.tryserver.is_tryserver:
- api.webrtc.apply_svn_patch()
-
- if does_build:
- api.base_android.envsetup()
-
- # WebRTC Android APK testers also have to run the runhooks, since test
- # resources are currently downloaded during this step.
- api.base_android.runhooks()
-
- api.chromium.cleanup_temp()
- if does_build:
- api.base_android.compile()
-
- # Can't use webrtc_revision when passing builds between builders and testers
- # since it will differ between builder and tester syncs if additional
- # revisions are committed between their runs.
- archive_rev = got_revision if webrtc_revision == 'HEAD' else webrtc_revision
- if bot_type == 'builder':
- api.webrtc.package_build(
- api.webrtc.GS_ARCHIVES[bot_config['build_gs_archive']], archive_rev)
-
- if bot_type == 'tester':
- api.webrtc.extract_build(
- api.webrtc.GS_ARCHIVES[bot_config['build_gs_archive']], archive_rev)
-
- if does_test:
- api.chromium_android.common_tests_setup_steps()
- #TODO(martiniss) convert loop
- for test in api.webrtc.ANDROID_APK_TESTS:
- api.base_android.test_runner(test)
-
- api.chromium_android.common_tests_final_steps()
-
-
-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,
- parent_got_revision=None, suffix=None):
- suffix = suffix or ''
- 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))
-
- webrtc_config_kwargs = bot_config.get('webrtc_config_kwargs', {})
- test = (
- api.test('%s_%s%s' % (_sanitize_nonalpha(mastername),
- _sanitize_nonalpha(buildername), suffix)) +
- api.properties(mastername=mastername,
- buildername=buildername,
- slavename='fake_slavename',
- parent_buildername=bot_config.get('parent_buildername'),
- TARGET_PLATFORM=webrtc_config_kwargs['TARGET_PLATFORM'],
- TARGET_ARCH=webrtc_config_kwargs['TARGET_ARCH'],
- TARGET_BITS=webrtc_config_kwargs['TARGET_BITS'],
- BUILD_CONFIG=webrtc_config_kwargs['BUILD_CONFIG']) +
- api.platform(bot_config['testing']['platform'],
- webrtc_config_kwargs.get('TARGET_BITS', 64))
- )
- if bot_type in ('builder', 'builder_tester'):
- test += api.step_data('envsetup',
- api.json.output({
- 'FOO': 'bar',
- 'GYP_DEFINES': 'my_new_gyp_def=aaa',
- }))
-
- if revision:
- test += api.properties(revision=revision)
- if bot_type == 'tester':
- parent_rev = parent_got_revision or revision
- test += api.properties(parent_got_revision=parent_rev)
-
- if mastername.startswith('tryserver'):
- test += api.properties(patch_url='try_job_svn_patch')
-
- return test
-
- for mastername in ('client.webrtc', 'tryserver.webrtc'):
- master_config = api.webrtc.BUILDERS[mastername]
- for buildername, bot_config in master_config['builders'].iteritems():
- if bot_config['recipe_config'] != 'webrtc_android_apk':
- continue
- yield generate_builder(mastername, buildername, bot_config,
- revision='12345')
-
- # Forced build (no revision information).
- mastername = 'client.webrtc'
- buildername = 'Android Chromium-APK Builder'
- bot_config = api.webrtc.BUILDERS[mastername]['builders'][buildername]
- yield generate_builder(mastername, buildername, bot_config, revision=None,
- suffix='_forced')
-
- buildername = 'Android Chromium-APK Tests (KK Nexus5)'
- bot_config = api.webrtc.BUILDERS[mastername]['builders'][buildername]
- yield generate_builder(mastername, buildername, bot_config, revision=None,
- parent_got_revision='12345', suffix='_forced')

Powered by Google App Engine
This is Rietveld 408576698