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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: testing/buildbot/chromium.android.json

Issue 2873833002: Rename android_webview_test_apk (Closed)
Patch Set: remove wrongly added gce_adb_wrapper deps Created 3 years, 7 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
« no previous file with comments | « build/android/pylib/results/report_results.py ('k') | testing/buildbot/chromium.android.fyi.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/buildbot/chromium.android.json
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 8a43fe9f37fc05a2b937c574ce5e1d519dc87e56..50d1290638ceab82e7e172f7133ff3673e860d52 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -6,50 +6,6 @@
},
"Android N5X Swarm Builder": {
"gtest_tests": [
- {
- "merge": {
- "args": [
- "--bucket",
- "chromium-result-details",
- "--test-name",
- "android_webview_test_apk"
- ],
- "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
- },
- "override_compile_targets": [
- "android_webview_test_apk"
- ],
- "override_isolate_target": "android_webview_test_apk",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
- }
- ],
- "dimension_sets": [
- {
- "android_devices": "6",
- "device_os": "MMB29Q",
- "device_type": "bullhead"
- }
- ],
- "hard_timeout": 1800,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
- "test": "android_webview_test_apk"
- },
{
"merge": {
"args": [
@@ -1538,6 +1494,50 @@
]
},
"test": "vr_shell_unittests"
+ },
+ {
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "override_compile_targets": [
+ "webview_instrumentation_test_apk"
+ ],
+ "override_isolate_target": "webview_instrumentation_test_apk",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+ "location": "bin",
+ "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+ }
+ ],
+ "dimension_sets": [
+ {
+ "android_devices": "6",
+ "device_os": "MMB29Q",
+ "device_type": "bullhead"
+ }
+ ],
+ "hard_timeout": 1800,
+ "output_links": [
+ {
+ "link": [
+ "https://luci-logdog.appspot.com/v/?s",
+ "=android%2Fswarming%2Flogcats%2F",
+ "${TASK_ID}%2F%2B%2Funified_logcats"
+ ],
+ "name": "shard #${SHARD_INDEX} logcats"
+ }
+ ]
+ },
+ "test": "webview_instrumentation_test_apk"
}
],
"isolated_scripts": [
@@ -1672,9 +1672,6 @@
}
],
"instrumentation_tests": [
- {
- "test": "android_webview_test_apk"
- },
{
"test": "chrome_public_test_apk"
},
@@ -1683,6 +1680,9 @@
},
{
"test": "content_shell_test_apk"
+ },
+ {
+ "test": "webview_instrumentation_test_apk"
}
]
},
@@ -2867,14 +2867,14 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "android_webview_test_apk"
+ "chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"override_compile_targets": [
- "android_webview_test_apk"
+ "chrome_public_test_apk"
],
- "override_isolate_target": "android_webview_test_apk",
+ "override_isolate_target": "chrome_public_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
@@ -2886,13 +2886,13 @@
],
"dimension_sets": [
{
- "android_devices": "4",
+ "android_devices": "6",
"device_os": "LMY48I",
"device_type": "hammerhead"
}
],
"expiration": 10800,
- "hard_timeout": 960,
+ "hard_timeout": 1800,
"output_links": [
{
"link": [
@@ -2904,22 +2904,26 @@
}
]
},
- "test": "android_webview_test_apk"
+ "test": "chrome_public_test_apk"
},
{
+ "args": [
+ "--shared-prefs-file=../../chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
+ "--additional-apk=../../third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
+ ],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
- "chrome_public_test_apk"
+ "chrome_public_test_vr_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"override_compile_targets": [
- "chrome_public_test_apk"
+ "chrome_public_test_vr_apk"
],
- "override_isolate_target": "chrome_public_test_apk",
+ "override_isolate_target": "chrome_public_test_vr_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
@@ -2931,13 +2935,13 @@
],
"dimension_sets": [
{
- "android_devices": "6",
+ "android_devices": "4",
"device_os": "LMY48I",
"device_type": "hammerhead"
}
],
"expiration": 10800,
- "hard_timeout": 1800,
+ "hard_timeout": 960,
"output_links": [
{
"link": [
@@ -2949,26 +2953,22 @@
}
]
},
- "test": "chrome_public_test_apk"
+ "test": "chrome_public_test_vr_apk"
},
{
- "args": [
- "--shared-prefs-file=../../chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
- "--additional-apk=../../third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
- ],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
- "chrome_public_test_vr_apk"
+ "chrome_sync_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"override_compile_targets": [
- "chrome_public_test_vr_apk"
+ "chrome_sync_shell_test_apk"
],
- "override_isolate_target": "chrome_public_test_vr_apk",
+ "override_isolate_target": "chrome_sync_shell_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
@@ -2998,7 +2998,7 @@
}
]
},
- "test": "chrome_public_test_vr_apk"
+ "test": "chrome_sync_shell_test_apk"
},
{
"merge": {
@@ -3006,14 +3006,14 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "chrome_sync_shell_test_apk"
+ "content_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"override_compile_targets": [
- "chrome_sync_shell_test_apk"
+ "content_shell_test_apk"
],
- "override_isolate_target": "chrome_sync_shell_test_apk",
+ "override_isolate_target": "content_shell_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
@@ -3043,7 +3043,7 @@
}
]
},
- "test": "chrome_sync_shell_test_apk"
+ "test": "content_shell_test_apk"
},
{
"merge": {
@@ -3051,14 +3051,14 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "content_shell_test_apk"
+ "webview_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"override_compile_targets": [
- "content_shell_test_apk"
+ "webview_instrumentation_test_apk"
],
- "override_isolate_target": "content_shell_test_apk",
+ "override_isolate_target": "webview_instrumentation_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
@@ -3088,7 +3088,7 @@
}
]
},
- "test": "content_shell_test_apk"
+ "test": "webview_instrumentation_test_apk"
}
]
},
@@ -3183,9 +3183,6 @@
}
],
"instrumentation_tests": [
- {
- "test": "android_webview_test_apk"
- },
{
"test": "chrome_public_test_apk"
},
@@ -3194,6 +3191,9 @@
},
{
"test": "content_shell_test_apk"
+ },
+ {
+ "test": "webview_instrumentation_test_apk"
}
]
},
@@ -3239,96 +3239,6 @@
},
"test": "android_webview_unittests"
},
- {
- "merge": {
- "args": [
- "--bucket",
- "chromium-result-details",
- "--test-name",
- "android_webview_test_apk"
- ],
- "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
- },
- "override_compile_targets": [
- "android_webview_test_apk"
- ],
- "override_isolate_target": "android_webview_test_apk",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
- }
- ],
- "dimension_sets": [
- {
- "device_os": "MMB29Q",
- "device_type": "bullhead"
- }
- ],
- "hard_timeout": 960,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
- "test": "android_webview_test_apk"
- },
- {
- "args": [
- "--enable-browser-side-navigation"
- ],
- "merge": {
- "args": [
- "--bucket",
- "chromium-result-details",
- "--test-name",
- "browser_side_navigation_android_webview_test_apk"
- ],
- "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
- },
- "name": "browser_side_navigation_android_webview_test_apk",
- "override_compile_targets": [
- "android_webview_test_apk"
- ],
- "override_isolate_target": "android_webview_test_apk",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
- "location": "bin",
- "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
- }
- ],
- "dimension_sets": [
- {
- "device_os": "MMB29Q",
- "device_type": "bullhead"
- }
- ],
- "hard_timeout": 960,
- "output_links": [
- {
- "link": [
- "https://luci-logdog.appspot.com/v/?s",
- "=android%2Fswarming%2Flogcats%2F",
- "${TASK_ID}%2F%2B%2Funified_logcats"
- ],
- "name": "shard #${SHARD_INDEX} logcats"
- }
- ]
- },
- "test": "android_webview_test_apk"
- },
{
"merge": {
"args": [
@@ -4939,6 +4849,96 @@
]
},
"test": "vr_shell_unittests"
+ },
+ {
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "override_compile_targets": [
+ "webview_instrumentation_test_apk"
+ ],
+ "override_isolate_target": "webview_instrumentation_test_apk",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+ "location": "bin",
+ "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+ }
+ ],
+ "dimension_sets": [
+ {
+ "device_os": "MMB29Q",
+ "device_type": "bullhead"
+ }
+ ],
+ "hard_timeout": 960,
+ "output_links": [
+ {
+ "link": [
+ "https://luci-logdog.appspot.com/v/?s",
+ "=android%2Fswarming%2Flogcats%2F",
+ "${TASK_ID}%2F%2B%2Funified_logcats"
+ ],
+ "name": "shard #${SHARD_INDEX} logcats"
+ }
+ ]
+ },
+ "test": "webview_instrumentation_test_apk"
+ },
+ {
jbudorick 2017/05/10 21:43:18 Duplicate?
Shimi Zhang 2017/05/10 21:50:39 The later one has one more args --enable-browser-s
+ "args": [
+ "--enable-browser-side-navigation"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "browser_side_navigation_webview_instrumentation_test_apk"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "browser_side_navigation_webview_instrumentation_test_apk",
+ "override_compile_targets": [
+ "webview_instrumentation_test_apk"
+ ],
+ "override_isolate_target": "webview_instrumentation_test_apk",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+ "location": "bin",
+ "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+ }
+ ],
+ "dimension_sets": [
+ {
+ "device_os": "MMB29Q",
+ "device_type": "bullhead"
+ }
+ ],
+ "hard_timeout": 960,
+ "output_links": [
+ {
+ "link": [
+ "https://luci-logdog.appspot.com/v/?s",
+ "=android%2Fswarming%2Flogcats%2F",
+ "${TASK_ID}%2F%2B%2Funified_logcats"
+ ],
+ "name": "shard #${SHARD_INDEX} logcats"
+ }
+ ]
+ },
+ "test": "webview_instrumentation_test_apk"
}
]
},
@@ -5033,9 +5033,6 @@
}
],
"instrumentation_tests": [
- {
- "test": "android_webview_test_apk"
- },
{
"test": "chrome_public_test_apk"
},
@@ -5044,6 +5041,9 @@
},
{
"test": "content_shell_test_apk"
+ },
+ {
+ "test": "webview_instrumentation_test_apk"
}
]
}
« no previous file with comments | « build/android/pylib/results/report_results.py ('k') | testing/buildbot/chromium.android.fyi.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698