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

Unified Diff: scripts/slave/recipe_modules/chromium/chromium_fyi.py

Issue 1104533002: Add recipe for split AMP/local CQ. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: nit: remove extra line in chromium/example.py Created 5 years, 6 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/recipe_modules/chromium/chromium_fyi.py
diff --git a/scripts/slave/recipe_modules/chromium/chromium_fyi.py b/scripts/slave/recipe_modules/chromium/chromium_fyi.py
index f26f23f019627b779ea94a51fdde70d68675e660..0f442a6956ac93371b88ce8584487fad045334b0 100644
--- a/scripts/slave/recipe_modules/chromium/chromium_fyi.py
+++ b/scripts/slave/recipe_modules/chromium/chromium_fyi.py
@@ -1487,5 +1487,100 @@ SPEC = {
'platform': 'linux',
},
},
+ 'Android Tests (amp split)': {
+ 'chromium_config': 'android',
+ 'gclient_config': 'chromium',
+ 'gclient_apply_config': ['android'],
+ 'chromium_config_kwargs': {
+ 'BUILD_CONFIG': 'Release',
+ 'TARGET_BITS': 32,
+ 'TARGET_PLATFORM': 'android',
+ },
+ 'bot_type': 'tester',
+ 'parent_buildername': 'Android Builder',
+ 'android_config': 'main_builder',
+ 'root_devices': True,
+ 'enable_swarming': False,
+ 'tests': [
+ steps.AndroidInstrumentationTest(
+ 'AndroidWebViewTest', 'android_webview_test_apk',
+ isolate_file_path='android_webview/android_webview_test_apk.isolate',
+ adb_install_apk=(
+ 'AndroidWebView.apk', 'org.chromium.android_webview.shell')),
+ steps.AndroidInstrumentationTest(
+ 'ChromeShellTest', 'chrome_shell_test_apk',
+ isolate_file_path='chrome/chrome_shell_test_apk.isolate',
+ adb_install_apk=(
+ 'ChromeShell.apk', 'org.chromium.chrome.shell')),
+ steps.AndroidInstrumentationTest(
+ 'ContentShellTest', 'content_shell_test_apk',
+ isolate_file_path='content/content_shell_test_apk.isolate',
+ adb_install_apk=(
+ 'ContentShell.apk', 'org.chromium.content_shell_apk')),
+ steps.AndroidInstrumentationTest(
+ 'ChromeSyncShellTest', 'chrome_sync_shell_test_apk',
+ adb_install_apk=(
+ 'ChromeSyncShell.apk', 'org.chromium.chrome.browser.sync')),
+ steps.AMPGTestTest('android_webview_unittests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
jbudorick 2015/06/06 00:39:20 All of the current devices are 4.4.2, so I think w
navabi 2015/06/06 01:39:07 Done. I'll left the ['4.4.2'] to make it explicit.
+ device_timeout=60),
jbudorick 2015/06/06 00:39:20 Also, I'm not sure about using a device timeout. I
navabi 2015/06/06 01:39:07 I didn't realize this adds to the cycle time. I th
jbudorick 2015/06/08 13:17:35 Yeah, device selection is synchronous. Test execut
navabi 2015/06/18 19:47:48 Removed device_timeout.
+ steps.AMPGTestTest('base_unittests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60,
+ android_isolate_path='base/base_unittests.isolate'),
+ steps.GTestTest(
+ 'breakpad_unittests',
+ override_compile_targets=['breakpad_unittests_deps'],
+ android_isolate_path='breakpad/breakpad_unittests.isolate'),
+ steps.GTestTest('cc_unittests'),
+ steps.AMPGTestTest('components_unittests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60,
+ android_isolate_path='components/components_unittests.isolate'),
+ steps.GTestTest('content_browsertests'),
+ steps.GTestTest('content_unittests'),
+ steps.AMPGTestTest('events_unittests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60),
+ steps.AMPGTestTest('gl_tests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60),
+ steps.GTestTest('gpu_unittests'),
+ steps.AMPGTestTest('ipc_tests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60),
+ steps.GTestTest('media_unittests'),
+ steps.GTestTest('net_unittests'),
+ steps.GTestTest(
+ 'sandbox_linux_unittests',
+ override_compile_targets=['sandbox_linux_unittests_deps']),
+ steps.AMPGTestTest('sql_unittests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60,
+ android_isolate_path='sql/sql_unittests.isolate'),
+ steps.AMPGTestTest('sync_unit_tests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60,
+ android_isolate_path='sync/sync_unit_tests.isolate'),
+ steps.AMPGTestTest('ui_android_unittests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60),
+ steps.GTestTest('ui_base_unittests'),
+ steps.AMPGTestTest('ui_touch_selection_unittests',
+ device_name=['Nexus 5'], device_os=['4.4.2', '4.4.3'],
+ device_timeout=60),
+ steps.GTestTest('unit_tests'),
+ steps.AndroidJunitTest('junit_unit_tests'),
+ steps.AndroidJunitTest('chrome_junit_tests'),
+ steps.AndroidJunitTest('content_junit_tests'),
+ ],
+ 'test_generators': [
+ steps.generate_gtest,
+ steps.generate_script,
+ ],
+ 'testing': {
+ 'platform': 'linux',
+ },
+ },
},
}

Powered by Google App Engine
This is Rietveld 408576698