| Index: testing/buildbot/chromium.android.json
|
| diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
|
| index 64d40c18892cd2371a3d827dfa291dd0aec3cb21..d6387fa85196cf4db18feba22244d2259f7469f2 100644
|
| --- a/testing/buildbot/chromium.android.json
|
| +++ b/testing/buildbot/chromium.android.json
|
| @@ -7,9 +7,6 @@
|
| "Android N5X Swarm Builder": {
|
| "gtest_tests": [
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -279,9 +276,6 @@
|
| "test": "chrome_public_test_vr_apk"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -400,9 +394,6 @@
|
| "test": "components_unittests"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -1033,9 +1024,6 @@
|
| "test": "mojo_system_unittests"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -2778,9 +2766,6 @@
|
| "test": "vr_shell_unittests"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -2824,8 +2809,7 @@
|
| {
|
| "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",
|
| - "--gs-results-bucket=chromium-result-details"
|
| + "--additional-apk=../../third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
|
| ],
|
| "merge": {
|
| "args": [
|
| @@ -2909,9 +2893,6 @@
|
| "test": "chrome_sync_shell_test_apk"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -2953,9 +2934,6 @@
|
| "test": "content_shell_test_apk"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -3139,9 +3117,6 @@
|
| "test": "android_webview_unittests"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -3328,9 +3303,6 @@
|
| "test": "cc_unittests"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -3340,6 +3312,7 @@
|
| ],
|
| "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| },
|
| + "render_results_dir": "chrome/test/data/android/render_tests",
|
| "swarming": {
|
| "can_use_on_swarming_builders": true,
|
| "cipd_packages": [
|
| @@ -3415,8 +3388,7 @@
|
| },
|
| {
|
| "args": [
|
| - "--enable-browser-side-navigation",
|
| - "--gs-results-bucket=chromium-result-details"
|
| + "--enable-browser-side-navigation"
|
| ],
|
| "merge": {
|
| "args": [
|
| @@ -3428,6 +3400,7 @@
|
| "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| },
|
| "name": "browser_side_navigation_chrome_public_test_apk",
|
| + "render_results_dir": "chrome/test/data/android/render_tests",
|
| "swarming": {
|
| "can_use_on_swarming_builders": true,
|
| "cipd_packages": [
|
| @@ -3458,9 +3431,6 @@
|
| "test": "chrome_public_test_apk"
|
| },
|
| {
|
| - "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| "merge": {
|
| "args": [
|
| "--bucket",
|
| @@ -3498,89 +3468,6 @@
|
| ]
|
| },
|
| "test": "chrome_sync_shell_test_apk"
|
| - },
|
| - {
|
| - "args": [
|
| - "--enable-browser-side-navigation",
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| - "merge": {
|
| - "args": [
|
| - "--bucket",
|
| - "chromium-result-details",
|
| - "--test-name",
|
| - "browser_side_navigation_chrome_sync_shell_test_apk"
|
| - ],
|
| - "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| - },
|
| - "name": "browser_side_navigation_chrome_sync_shell_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": 600,
|
| - "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": "chrome_sync_shell_test_apk"
|
| - },
|
| - {
|
| - "merge": {
|
| - "args": [
|
| - "--bucket",
|
| - "chromium-result-details",
|
| - "--test-name",
|
| - "components_browsertests"
|
| - ],
|
| - "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| - },
|
| - "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": "components_browsertests"
|
| },
|
| {
|
| "args": [
|
| @@ -3591,11 +3478,50 @@
|
| "--bucket",
|
| "chromium-result-details",
|
| "--test-name",
|
| - "browser_side_navigation_components_browsertests"
|
| - ],
|
| - "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| - },
|
| - "name": "browser_side_navigation_components_browsertests",
|
| + "browser_side_navigation_chrome_sync_shell_test_apk"
|
| + ],
|
| + "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| + },
|
| + "name": "browser_side_navigation_chrome_sync_shell_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": 600,
|
| + "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": "chrome_sync_shell_test_apk"
|
| + },
|
| + {
|
| + "merge": {
|
| + "args": [
|
| + "--bucket",
|
| + "chromium-result-details",
|
| + "--test-name",
|
| + "components_browsertests"
|
| + ],
|
| + "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| + },
|
| "swarming": {
|
| "can_use_on_swarming_builders": true,
|
| "cipd_packages": [
|
| @@ -3624,45 +3550,6 @@
|
| ]
|
| },
|
| "test": "components_browsertests"
|
| - },
|
| - {
|
| - "merge": {
|
| - "args": [
|
| - "--bucket",
|
| - "chromium-result-details",
|
| - "--test-name",
|
| - "components_unittests"
|
| - ],
|
| - "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| - },
|
| - "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": "components_unittests"
|
| },
|
| {
|
| "args": [
|
| @@ -3673,11 +3560,50 @@
|
| "--bucket",
|
| "chromium-result-details",
|
| "--test-name",
|
| - "browser_side_navigation_components_unittests"
|
| - ],
|
| - "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| - },
|
| - "name": "browser_side_navigation_components_unittests",
|
| + "browser_side_navigation_components_browsertests"
|
| + ],
|
| + "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| + },
|
| + "name": "browser_side_navigation_components_browsertests",
|
| + "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": "components_browsertests"
|
| + },
|
| + {
|
| + "merge": {
|
| + "args": [
|
| + "--bucket",
|
| + "chromium-result-details",
|
| + "--test-name",
|
| + "components_unittests"
|
| + ],
|
| + "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| + },
|
| "swarming": {
|
| "can_use_on_swarming_builders": true,
|
| "cipd_packages": [
|
| @@ -3706,45 +3632,6 @@
|
| ]
|
| },
|
| "test": "components_unittests"
|
| - },
|
| - {
|
| - "merge": {
|
| - "args": [
|
| - "--bucket",
|
| - "chromium-result-details",
|
| - "--test-name",
|
| - "content_browsertests"
|
| - ],
|
| - "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| - },
|
| - "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": 1200,
|
| - "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": "content_browsertests"
|
| },
|
| {
|
| "args": [
|
| @@ -3755,6 +3642,88 @@
|
| "--bucket",
|
| "chromium-result-details",
|
| "--test-name",
|
| + "browser_side_navigation_components_unittests"
|
| + ],
|
| + "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| + },
|
| + "name": "browser_side_navigation_components_unittests",
|
| + "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": "components_unittests"
|
| + },
|
| + {
|
| + "merge": {
|
| + "args": [
|
| + "--bucket",
|
| + "chromium-result-details",
|
| + "--test-name",
|
| + "content_browsertests"
|
| + ],
|
| + "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| + },
|
| + "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": 1200,
|
| + "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": "content_browsertests"
|
| + },
|
| + {
|
| + "args": [
|
| + "--enable-browser-side-navigation"
|
| + ],
|
| + "merge": {
|
| + "args": [
|
| + "--bucket",
|
| + "chromium-result-details",
|
| + "--test-name",
|
| "browser_side_navigation_content_browsertests"
|
| ],
|
| "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| @@ -3790,51 +3759,47 @@
|
| "test": "content_browsertests"
|
| },
|
| {
|
| + "merge": {
|
| + "args": [
|
| + "--bucket",
|
| + "chromium-result-details",
|
| + "--test-name",
|
| + "content_shell_test_apk"
|
| + ],
|
| + "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| + },
|
| + "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": 1920,
|
| + "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": "content_shell_test_apk"
|
| + },
|
| + {
|
| "args": [
|
| - "--gs-results-bucket=chromium-result-details"
|
| - ],
|
| - "merge": {
|
| - "args": [
|
| - "--bucket",
|
| - "chromium-result-details",
|
| - "--test-name",
|
| - "content_shell_test_apk"
|
| - ],
|
| - "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
| - },
|
| - "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": 1920,
|
| - "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": "content_shell_test_apk"
|
| - },
|
| - {
|
| - "args": [
|
| - "--enable-browser-side-navigation",
|
| - "--gs-results-bucket=chromium-result-details"
|
| + "--enable-browser-side-navigation"
|
| ],
|
| "merge": {
|
| "args": [
|
|
|