chromium/src
0
Fork 0
Code Activity

weblayer: remove weblayer/webengine tests from bots

Browse Source 
src/weblayer is no longer needed.

This patch removes weblayer/webengine related tests as well as
removing weblayer from BUILD.gn.

Bug: 1471446

Change-Id: Icc97bbd9505b3c82b1b20774b9faa9d1c82bb273
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4753720
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1181603}
This commit is contained in:
Scott Violet
2023-08-09 18:25:10 +00:00
committed by Chromium LUCI CQ
parent 07f264e354
commit 9864751037
10 changed files with 0 additions and 1280 deletions

8
BUILD.gn

@ -232,14 +232,6 @@ group("gn_all") {
]
}
if (is_android) {
deps += [
"//weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk",
"//weblayer/browser/java:weblayer_junit_tests",
"//weblayer/test:weblayer_browsertests",
]
}
if (!is_ios && !is_android) {
deps += [ "//components/viz/demo:viz_demo" ]
}

12
infra/config/generated/testing/gn_isolate_map.pyl

@ -1926,10 +1926,6 @@
"${ISOLATED_OUTDIR}",
],
},
"weblayer_browsertests": {
"label": "//weblayer/test:weblayer_browsertests",
"type": "windowed_test_launcher",
},
"webview_cts_tests": {
"label": "//android_webview/test:webview_cts_tests",
"type": "script",
@ -1990,14 +1986,6 @@
"-v",
],
},
"webengine_support_instrumentation_test_apk": {
"label": "//weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk",
"type": "console_test_launcher",
},
"weblayer_junit_tests": {
"label": "//weblayer/browser/java:weblayer_junit_tests",
"type": "junit_test",
},
"webview_instrumentation_test_apk": {
"label": "//android_webview/test:webview_instrumentation_test_apk",
"type": "console_test_launcher",

15
infra/config/targets/targets.star

@ -2352,11 +2352,6 @@ targets.generated_script(
],
)
targets.windowed_test_launcher(
name = "weblayer_browsertests",
label = "//weblayer/test:weblayer_browsertests",
)
targets.script(
name = "webview_cts_tests",
label = "//android_webview/test:webview_cts_tests",
@ -2421,16 +2416,6 @@ targets.script(
],
)
targets.console_test_launcher(
name = "webengine_support_instrumentation_test_apk",
label = "//weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk",
)
targets.junit_test(
name = "weblayer_junit_tests",
label = "//weblayer/browser/java:weblayer_junit_tests",
)
targets.console_test_launcher(
name = "webview_instrumentation_test_apk",
label = "//android_webview/test:webview_instrumentation_test_apk",

108
testing/buildbot/chromium.android.fyi.json

@ -3558,114 +3558,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android32_foldable_experimental.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android32_foldable_experimental",
"path": ".android_emulator/generic_android32_foldable_experimental"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android32_foldable_experimental"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android32_foldable_experimental.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android32_foldable_experimental",
"path": ".android_emulator/generic_android32_foldable_experimental"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android32_foldable_experimental"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",

852
testing/buildbot/chromium.android.json

@ -1199,12 +1199,6 @@
"name": "webapk_shell_apk_junit_tests",
"test": "webapk_shell_apk_junit_tests",
"test_id_prefix": "ninja://chrome/android/webapk/shell_apk:webapk_shell_apk_junit_tests/"
},
{
"experiment_percentage": 100,
"name": "weblayer_junit_tests",
"test": "weblayer_junit_tests",
"test_id_prefix": "ninja://weblayer/browser/java:weblayer_junit_tests/"
}
]
},
@ -5684,114 +5678,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android30",
"path": ".android_emulator/generic_android30"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android30"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android30",
"path": ".android_emulator/generic_android30"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android30"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -9844,120 +9730,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android31.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android31",
"path": ".android_emulator/generic_android31"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android31"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android31.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android31",
"path": ".android_emulator/generic_android31"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android31"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--use-persistent-shell",
@ -13870,114 +13642,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android32_foldable.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android32_foldable",
"path": ".android_emulator/generic_android32_foldable"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android32_foldable"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android32_foldable.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android32_foldable",
"path": ".android_emulator/generic_android32_foldable"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android32_foldable"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -20614,88 +20278,6 @@
"test": "vr_common_unittests",
"test_id_prefix": "ninja://chrome/browser/vr:vr_common_unittests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -21019,16 +20601,6 @@
},
"test": "webapk_shell_apk_junit_tests",
"test_id_prefix": "ninja://chrome/android/webapk/shell_apk:webapk_shell_apk_junit_tests/"
},
{
"experiment_percentage": 100,
"name": "weblayer_junit_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"test": "weblayer_junit_tests",
"test_id_prefix": "ninja://weblayer/browser/java:weblayer_junit_tests/"
}
]
},
@ -28894,120 +28466,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android24.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android24",
"path": ".android_emulator/generic_android24"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android24"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android24.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android24",
"path": ".android_emulator/generic_android24"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android24"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--use-persistent-shell",
@ -33736,120 +33194,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android26.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android26",
"path": ".android_emulator/generic_android26"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android26"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android26.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android26",
"path": ".android_emulator/generic_android26"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android26"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--use-persistent-shell",
@ -35842,94 +35186,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--use-persistent-shell",
@ -39518,114 +38774,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android28",
"path": ".android_emulator/generic_android28"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android28"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android28",
"path": ".android_emulator/generic_android28"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android28"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",

209
testing/buildbot/chromium.coverage.json

@ -315,90 +315,6 @@
"test": "vr_android_unittests",
"test_id_prefix": "ninja://chrome/browser/android/vr:vr_android_unittests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -705,17 +621,6 @@
},
"test": "webapk_shell_apk_junit_tests",
"test_id_prefix": "ninja://chrome/android/webapk/shell_apk:webapk_shell_apk_junit_tests/"
},
{
"experiment_percentage": 100,
"isolate_profile_data": true,
"name": "weblayer_junit_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"test": "weblayer_junit_tests",
"test_id_prefix": "ninja://weblayer/browser/java:weblayer_junit_tests/"
}
]
},
@ -6937,120 +6842,6 @@
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android24.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webengine_support_instrumentation_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android24",
"path": ".android_emulator/generic_android24"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android24"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webengine_support_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk/"
},
{
"args": [
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android24.textpb"
],
"ci_only": true,
"isolate_profile_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cores": "4",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "generic_android24",
"path": ".android_emulator/generic_android24"
}
],
"optional_dimensions": {
"60": {
"caches": "generic_android24"
}
},
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_browsertests",
"test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
},
{
"args": [
"--use-persistent-shell",

1
testing/buildbot/generate_buildbot_json.py

@ -29,7 +29,6 @@ THIS_DIR = os.path.dirname(os.path.abspath(__file__))
BROWSER_CONFIG_TO_TARGET_SUFFIX_MAP = {
'android-chromium': '_android_chrome',
'android-chromium-monochrome': '_android_monochrome',
'android-weblayer': '_android_weblayer',
'android-webview': '_android_webview',
}

12
testing/buildbot/gn_isolate_map.pyl

@ -1926,10 +1926,6 @@
"${ISOLATED_OUTDIR}",
],
},
"weblayer_browsertests": {
"label": "//weblayer/test:weblayer_browsertests",
"type": "windowed_test_launcher",
},
"webview_cts_tests": {
"label": "//android_webview/test:webview_cts_tests",
"type": "script",
@ -1990,14 +1986,6 @@
"-v",
],
},
"webengine_support_instrumentation_test_apk": {
"label": "//weblayer/browser/android/javatests:webengine_support_instrumentation_test_apk",
"type": "console_test_launcher",
},
"weblayer_junit_tests": {
"label": "//weblayer/browser/java:weblayer_junit_tests",
"type": "junit_test",
},
"webview_instrumentation_test_apk": {
"label": "//android_webview/test:webview_instrumentation_test_apk",
"type": "console_test_launcher",

42
testing/buildbot/test_suite_exceptions.pyl

@ -4688,27 +4688,6 @@
'linux-rel-cft',
],
},
'webengine_support_instrumentation_test_apk': {
'modifications': {
'android-12-x64-rel': {
'ci_only': True,
},
# If you change this, make similar changes in android-x86-code-coverage below
'android-nougat-x86-rel': {
'ci_only': True,
},
'android-oreo-x86-rel': {
'ci_only': True,
},
'android-pie-arm64-rel': {
'ci_only': True,
},
# Keep this same as android-nougat-x86-rel above
'android-x86-code-coverage': {
'ci_only': True,
},
},
},
'webgl2_conformance_d3d11_passthrough_tests': {
'remove_from': [
# Removed from V8 builder since WebGL 1 should provide reasonable
@ -5084,27 +5063,6 @@
},
},
},
'weblayer_browsertests': {
'modifications': {
'android-12-x64-rel': {
'ci_only': True,
},
# If you change this, make similar changes in android-x86-code-coverage below
'android-nougat-x86-rel': {
'ci_only': True,
},
'android-oreo-x86-rel': {
'ci_only': True,
},
'android-pie-arm64-rel': {
'ci_only': True,
},
# Keep this same as android-nougat-x86-rel above
'android-x86-code-coverage': {
'ci_only': True,
},
},
},
'webview_64_cts_tests': {
'modifications': {
'android-pie-arm64-rel': {

21
testing/buildbot/test_suites.pyl

@ -196,7 +196,6 @@
},
},
'viz_unittests': {},
'webengine_support_instrumentation_test_apk': {},
'webview_instrumentation_test_apk': {
'swarming': {
'shards': 7,
@ -1138,13 +1137,6 @@
'nougat-x86-emulator',
],
},
'weblayer_junit_tests': {
'remove_mixins': [
'nougat-x86-emulator',
],
# Experimental until we're sure these are stable.
'experiment_percentage': 100
},
},
'chromium_junit_tests_scripts': {
@ -5726,11 +5718,6 @@
'web_engine_unittests': {},
},
'webengine_android_gtests': {
'webengine_support_instrumentation_test_apk': {},
'weblayer_browsertests': {},
},
'webrtc_chromium_baremetal_gtests': {
# Run capture unittests on bots that have real webcams.
'capture_unittests': {
@ -6233,7 +6220,6 @@
'linux_flavor_specific_chromium_gtests',
'vr_android_specific_chromium_tests',
'vr_platform_specific_chromium_gtests',
'webengine_android_gtests',
],
'android_nougat_emulator_gtests': [
@ -6246,7 +6232,6 @@
'chromium_gtests_for_devices_with_graphical_output',
'linux_flavor_specific_chromium_gtests',
'system_webview_shell_instrumentation_tests', # Not an experimental test
'webengine_android_gtests',
'webview_cts_tests_gtest',
'webview_ui_instrumentation_tests',
],
@ -6272,7 +6257,6 @@
'chrome_public_tests',
'vr_android_specific_chromium_tests',
'webview_ui_instrumentation_tests',
'webengine_android_gtests',
],
'android_pie_gtests': [
@ -6299,7 +6283,6 @@
'system_webview_shell_instrumentation_tests', # Not an experimental test
'webview_cts_tests_gtest',
'webview_ui_instrumentation_tests',
'webengine_android_gtests',
],
'android_pie_rel_gtests': [
@ -6318,7 +6301,6 @@
# 'vr_platform_specific_chromium_gtests',
'webview_64_cts_tests_gtest',
'webview_ui_instrumentation_tests',
'webengine_android_gtests',
],
'bfcache_android_gtests': [
@ -7210,7 +7192,6 @@
'chromium_gtests_for_devices_with_graphical_output': {},
'linux_flavor_specific_chromium_gtests': {},
'system_webview_shell_instrumentation_tests': {}, # Not an experimental test
'webengine_android_gtests': {},
'webview_trichrome_cts_tests': {
'variants': [
'WEBVIEW_TRICHROME_FULL_CTS_TESTS',
@ -7237,7 +7218,6 @@
'linux_flavor_specific_chromium_gtests': {},
'minidump_uploader_tests': {},
'system_webview_shell_instrumentation_tests': {}, # Not an experimental test
'webengine_android_gtests': {},
'webview_trichrome_64_cts_tests': {
'variants': [
'WEBVIEW_TRICHROME_FULL_CTS_TESTS',
@ -7256,7 +7236,6 @@
'chromium_gtests_for_devices_with_graphical_output': {},
'linux_flavor_specific_chromium_gtests': {},
'system_webview_shell_instrumentation_tests': {}, # Not an experimental test
'webengine_android_gtests': {},
'webview_ui_instrumentation_tests': {},
},