Index: scripts/slave/recipe_modules/chromium_tests/chromium_linux.py |
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py b/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py |
index 68f395551bb4867defa29fb1a7866adeac5bda9a..e1df9133f79e3682c08c7033a4c364548f3fcc68 100644 |
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py |
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_linux.py |
@@ -139,6 +139,133 @@ SPEC = { |
'enable_swarming': True, |
}, |
+ # for testing trusty |
+ 'Linux Builder Trusty': { |
+ 'chromium_config': 'chromium', |
+ 'chromium_apply_config': [ |
+ 'mb', |
+ 'ninja_confirm_noop', |
+ 'archive_gpu_tests', |
+ 'chrome_with_codecs' |
+ ], |
+ 'gclient_config': 'chromium', |
+ 'chromium_config_kwargs': { |
+ 'BUILD_CONFIG': 'Release', |
+ 'TARGET_BITS': 64, |
+ }, |
+ 'bot_type': 'builder', |
+ 'compile_targets': [ |
+ 'chromium_swarm_tests', |
+ ], |
+ 'testing': { |
+ 'platform': 'linux', |
+ }, |
+ 'use_isolate': True, |
+ 'enable_swarming': True, |
+ 'checkout_dir': 'linux', |
+ }, |
+ 'Linux Tests Trusty': { |
+ 'chromium_config': 'chromium', |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
+ 'gclient_config': 'chromium', |
+ 'chromium_config_kwargs': { |
+ 'BUILD_CONFIG': 'Release', |
+ 'TARGET_BITS': 64, |
+ }, |
+ 'bot_type': 'tester', |
+ 'test_generators': [ |
+ steps.generate_gtest, |
+ steps.generate_script, |
+ steps.generate_isolated_script, |
+ ], |
+ 'parent_buildername': 'Linux Builder', |
Paweł Hajdan Jr.
2016/09/28 19:13:50
Please use corresponding Trusty builders for teste
Yoshisato Yanagisawa
2016/09/29 10:04:02
good catch!
|
+ 'testing': { |
+ 'platform': 'linux', |
+ }, |
+ 'enable_swarming': True, |
+ }, |
+ 'Linux Builder Trusty (dbg)(32)': { |
+ 'chromium_config': 'chromium', |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
+ 'gclient_config': 'chromium', |
+ 'chromium_config_kwargs': { |
+ 'BUILD_CONFIG': 'Debug', |
+ 'TARGET_BITS': 32, |
+ }, |
+ 'bot_type': 'builder', |
+ 'compile_targets': [ |
+ 'google_apis_unittests', |
+ 'sync_integration_tests', |
+ ], |
+ 'testing': { |
+ 'platform': 'linux', |
+ }, |
+ 'use_isolate': True, |
+ 'enable_swarming': True, |
+ 'checkout_dir': 'linux', |
+ # Temporary hack because the binaries are too large to be isolated. |
+ 'GYP_DEFINES': { |
+ 'fastbuild': 2, |
+ }, |
+ }, |
+ 'Linux Tests Trusty (dbg)(1)(32)': { |
+ 'chromium_config': 'chromium', |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
+ 'gclient_config': 'chromium', |
+ 'chromium_config_kwargs': { |
+ 'BUILD_CONFIG': 'Debug', |
+ 'TARGET_BITS': 32, |
+ }, |
+ 'bot_type': 'tester', |
+ 'test_generators': [ |
+ steps.generate_gtest, |
+ steps.generate_script, |
+ steps.generate_isolated_script, |
+ ], |
+ 'parent_buildername': 'Linux Builder (dbg)(32)', |
+ 'testing': { |
+ 'platform': 'linux', |
+ }, |
+ 'enable_swarming': True, |
+ }, |
+ |
+ 'Linux Builder Trusty (dbg)': { |
+ 'chromium_config': 'chromium', |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
+ 'gclient_config': 'chromium', |
+ 'chromium_config_kwargs': { |
+ 'BUILD_CONFIG': 'Debug', |
+ 'TARGET_BITS': 64, |
+ }, |
+ 'bot_type': 'builder', |
+ 'testing': { |
+ 'platform': 'linux', |
+ }, |
+ 'enable_swarming': True, |
+ 'use_isolate': True, |
+ 'checkout_dir': 'linux', |
+ }, |
+ 'Linux Tests Trusty (dbg)(1)': { |
+ 'chromium_config': 'chromium', |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
+ 'gclient_config': 'chromium', |
+ 'chromium_config_kwargs': { |
+ 'BUILD_CONFIG': 'Debug', |
+ 'TARGET_BITS': 64, |
+ }, |
+ 'bot_type': 'tester', |
+ 'test_generators': [ |
+ steps.generate_gtest, |
+ steps.generate_script, |
+ steps.generate_isolated_script, |
+ ], |
+ 'parent_buildername': 'Linux Builder (dbg)', |
+ 'testing': { |
+ 'platform': 'linux', |
+ }, |
+ 'enable_swarming': True, |
+ }, |
+ |
'Android Arm64 Builder (dbg)': { |
'chromium_config': 'android', |
'chromium_apply_config': ['chrome_with_codecs', 'mb'], |