Index: scripts/slave/recipe_modules/chromium_tests/chromium_android.py |
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_android.py b/scripts/slave/recipe_modules/chromium_tests/chromium_android.py |
index 53783de0fd59efe5edc18e6be05cacbbc3dfd8ab..940c5792f2fe229d44777d9713fb3740692f2e83 100644 |
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_android.py |
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_android.py |
@@ -149,8 +149,7 @@ SPEC = { |
}, |
}, |
- 'Marshmallow 64 bit Tester': { |
bpastene
2016/11/09 20:04:13
I just moved 'Marshmallow 64 bit Tester' down a co
|
- 'enable_swarming': True, |
+ 'Lollipop Consumer Tester': { |
'chromium_config': 'android', |
'gclient_config': 'chromium', |
'gclient_apply_config': ['android'], |
@@ -167,7 +166,7 @@ SPEC = { |
}, |
}, |
- 'Lollipop Consumer Tester': { |
+ 'Lollipop Low-end Tester': { |
'chromium_config': 'android', |
'gclient_config': 'chromium', |
'gclient_apply_config': ['android'], |
@@ -175,16 +174,18 @@ SPEC = { |
'BUILD_CONFIG': 'Debug', |
'TARGET_PLATFORM': 'android', |
}, |
- 'parent_buildername': 'Android arm64 Builder (dbg)', |
+ 'parent_buildername': 'Android arm Builder (dbg)', |
'bot_type': 'tester', |
- 'android_config': 'arm64_builder_mb', |
+ 'android_config': 'main_builder_mb', |
'test_results_config': 'public_server', |
'testing': { |
'platform': 'linux', |
}, |
}, |
- 'Lollipop Low-end Tester': { |
+ 'Lollipop Phone Tester': { |
+ 'use_isolate': True, |
+ 'enable_swarming': True, |
'chromium_config': 'android', |
'gclient_config': 'chromium', |
'gclient_apply_config': ['android'], |
@@ -201,9 +202,7 @@ SPEC = { |
}, |
}, |
- 'Lollipop Phone Tester': { |
- 'use_isolate': True, |
- 'enable_swarming': True, |
+ 'Lollipop Tablet Tester': { |
'chromium_config': 'android', |
'gclient_config': 'chromium', |
'gclient_apply_config': ['android'], |
@@ -220,7 +219,8 @@ SPEC = { |
}, |
}, |
- 'Lollipop Tablet Tester': { |
+ 'Marshmallow 64 bit Tester': { |
+ 'enable_swarming': True, |
'chromium_config': 'android', |
'gclient_config': 'chromium', |
'gclient_apply_config': ['android'], |
@@ -228,9 +228,9 @@ SPEC = { |
'BUILD_CONFIG': 'Debug', |
'TARGET_PLATFORM': 'android', |
}, |
- 'parent_buildername': 'Android arm Builder (dbg)', |
+ 'parent_buildername': 'Android arm64 Builder (dbg)', |
'bot_type': 'tester', |
- 'android_config': 'main_builder_mb', |
+ 'android_config': 'arm64_builder_mb', |
'test_results_config': 'public_server', |
'testing': { |
'platform': 'linux', |
@@ -254,6 +254,25 @@ SPEC = { |
}, |
}, |
+ 'Nougat Phone Tester': { |
+ 'use_isolate': True, |
+ 'enable_swarming': True, |
+ 'chromium_config': 'android', |
+ 'gclient_config': 'chromium', |
+ 'gclient_apply_config': ['android'], |
+ 'chromium_config_kwargs': { |
+ 'BUILD_CONFIG': 'Debug', |
+ 'TARGET_PLATFORM': 'android', |
+ }, |
+ 'parent_buildername': 'Android arm64 Builder (dbg)', |
+ 'bot_type': 'tester', |
+ 'android_config': 'arm64_builder_mb', |
+ 'test_results_config': 'public_server', |
+ 'testing': { |
+ 'platform': 'linux', |
+ }, |
+ }, |
+ |
'Android Swarm Builder': { |
'use_isolate': True, |
'enable_swarming': True, |