Add buildbot config for "android-webview-13-x64-dbg-hostside" temporary CI builder.
Added test suite and target "webview_trichrome_64_cts_hostside_tests" for trial running host-driven WebView CTS, supported by http://crrev/c/4901987
Added mixin description to display Android API level in Milo build step for API level 31 and 33.
Follow up work:
To remove these builders once host-driven CTS test suite is added to "android-12-x64-rel" required CQ builder.
Bug: b/267730567
Cq-Include-Trybots: luci.chromium.try:android-webview-13-x64-dbg-hostside
Change-Id: I5d1bc2fb5a32b04c08fe6cda54105f30d97432e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5116858
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Mateusz Zbikowski <zbikowski@google.com>
Commit-Queue: Gabrielle Lau <gabriellelau@google.com>
Cr-Commit-Position: refs/heads/main@{#1243460}
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
index 4cc80c9..198142ef 100644
--- a/android_webview/test/BUILD.gn
+++ b/android_webview/test/BUILD.gn
@@ -50,6 +50,16 @@
data = [ "//android_webview/tools/cts_config/" ]
}
+ python_library("webview_trichrome_64_cts_hostside_tests") {
+ pydeps_file = "//android_webview/tools/run_cts.pydeps"
+ deps = [ "//android_webview:trichrome_webview_64_apk" ]
+ data_deps = [ "//build/android:test_runner_py" ]
+ data = [
+ "//android_webview/tools/cts_config/",
+ "//third_party/chromium-variations",
+ ]
+ }
+
python_library("webview_trichrome_64_cts_tests") {
pydeps_file = "//android_webview/tools/run_cts.pydeps"
deps = [ "//android_webview:trichrome_webview_64_apk" ]
diff --git a/android_webview/tools/cts_config/webview_cts_hostside_gcs_path.json b/android_webview/tools/cts_config/webview_cts_hostside_gcs_path.json
new file mode 100644
index 0000000..56e5b46
--- /dev/null
+++ b/android_webview/tools/cts_config/webview_cts_hostside_gcs_path.json
@@ -0,0 +1,25 @@
+{
+ "T": {
+ "git": {
+ "tag_prefix": "android-cts-13.0"
+ },
+ "arch": {
+ "arm64": {
+ "filename": "arm64/T/android-cts-arm64-13_r6.zip",
+ "_origin": "https://dl.google.com/dl/android/cts/android-cts-13_r6-linux_x86-arm.zip",
+ "unzip_dir": "arm64/T/13_r6/"
+ },
+ "x86": {
+ "filename": "x86/T/android-cts-x86-13_r6.zip",
+ "_origin": "https://dl.google.com/dl/android/cts/android-cts-13_r6-linux_x86-x86.zip",
+ "unzip_dir": "x86/T/13_r6/"
+ }
+ },
+ "test_runs": [
+ {
+ "apk": "android-cts/testcases/CtsHostsideWebViewTests.apk",
+ "is_hostside": true
+ }
+ ]
+ }
+}
diff --git a/infra/config/generated/luci/project.cfg b/infra/config/generated/luci/project.cfg
index 17e9ec6..c90eabc 100644
--- a/infra/config/generated/luci/project.cfg
+++ b/infra/config/generated/luci/project.cfg
@@ -7,7 +7,7 @@
name: "chromium"
access: "group:all"
lucicfg {
- version: "1.43.2"
+ version: "1.43.1"
package_dir: "../.."
config_dir: "generated/luci"
entry_point: "main.star"
diff --git a/infra/config/generated/testing/gn_isolate_map.pyl b/infra/config/generated/testing/gn_isolate_map.pyl
index b00754dc..e9f56d9 100644
--- a/infra/config/generated/testing/gn_isolate_map.pyl
+++ b/infra/config/generated/testing/gn_isolate_map.pyl
@@ -1940,6 +1940,19 @@
"label": "//android_webview/test:webview_instrumentation_test_apk",
"type": "console_test_launcher",
},
+ "webview_trichrome_64_cts_hostside_tests": {
+ "label": "//android_webview/test:webview_trichrome_64_cts_hostside_tests",
+ "type": "script",
+ "script": "//android_webview/tools/run_cts.py",
+ "args": [
+ "--cts-gcs-path",
+ "../../android_webview/tools/cts_config/webview_cts_hostside_gcs_path.json",
+ "--additional-apk",
+ "apks/TrichromeLibrary64.apk",
+ "--use-webview-provider",
+ "apks/TrichromeWebView64.apk",
+ ],
+ },
"webview_trichrome_64_cts_tests": {
"label": "//android_webview/test:webview_trichrome_64_cts_tests",
"type": "script",
diff --git a/infra/config/generated/testing/mixins.pyl b/infra/config/generated/testing/mixins.pyl
index 8130237..69f5b2c 100644
--- a/infra/config/generated/testing/mixins.pyl
+++ b/infra/config/generated/testing/mixins.pyl
@@ -60,6 +60,7 @@
},
},
'12-x64-emulator': {
+ 'description': 'Run with android_31_google_apis_x64',
'args': [
'--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb',
],
@@ -132,6 +133,7 @@
},
},
'13-x64-emulator': {
+ 'description': 'Run with android_33_google_apis_x64',
'args': [
'--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb',
],
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl
index 667086e..8013fc5 100644
--- a/infra/config/generated/testing/test_suites.pyl
+++ b/infra/config/generated/testing/test_suites.pyl
@@ -5476,6 +5476,14 @@
},
},
+ 'webview_trichrome_64_cts_hostside_tests': {
+ 'webview_trichrome_64_cts_hostside_tests': {
+ 'mixins': [
+ 'webview_cts_archive',
+ ],
+ },
+ },
+
'webview_trichrome_64_cts_tests': {
'webview_trichrome_64_cts_tests': {
'mixins': [
diff --git a/infra/config/targets/basic_suites.star b/infra/config/targets/basic_suites.star
index 00ec3d5..b9b76e8 100644
--- a/infra/config/targets/basic_suites.star
+++ b/infra/config/targets/basic_suites.star
@@ -5058,6 +5058,13 @@
)
targets.legacy_basic_suite(
+ name = "webview_trichrome_64_cts_hostside_tests",
+ tests = {
+ "webview_trichrome_64_cts_hostside_tests": targets.legacy_test_config(),
+ },
+)
+
+targets.legacy_basic_suite(
name = "webview_trichrome_64_cts_tests",
tests = {
"webview_trichrome_64_cts_tests": targets.legacy_test_config(
diff --git a/infra/config/targets/binaries.star b/infra/config/targets/binaries.star
index 89e520b4..880bebe 100644
--- a/infra/config/targets/binaries.star
+++ b/infra/config/targets/binaries.star
@@ -2110,6 +2110,20 @@
)
targets.binaries.script(
+ name = "webview_trichrome_64_cts_hostside_tests",
+ label = "//android_webview/test:webview_trichrome_64_cts_hostside_tests",
+ script = "//android_webview/tools/run_cts.py",
+ args = [
+ "--cts-gcs-path",
+ "../../android_webview/tools/cts_config/webview_cts_hostside_gcs_path.json",
+ "--additional-apk",
+ "apks/TrichromeLibrary64.apk",
+ "--use-webview-provider",
+ "apks/TrichromeWebView64.apk",
+ ],
+)
+
+targets.binaries.script(
name = "webview_64_cts_tests",
label = "//android_webview/test:webview_64_cts_tests",
script = "//android_webview/tools/run_cts.py",
diff --git a/infra/config/targets/mixins.star b/infra/config/targets/mixins.star
index 35df94b..55e2ad4f 100644
--- a/infra/config/targets/mixins.star
+++ b/infra/config/targets/mixins.star
@@ -69,6 +69,7 @@
targets.mixin(
name = "12-x64-emulator",
+ description = "Run with android_31_google_apis_x64",
args = [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
],
@@ -153,6 +154,7 @@
targets.mixin(
name = "13-x64-emulator",
+ description = "Run with android_33_google_apis_x64",
args = [
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
],
diff --git a/infra/config/targets/tests.star b/infra/config/targets/tests.star
index 9e99208..7b7a131 100644
--- a/infra/config/targets/tests.star
+++ b/infra/config/targets/tests.star
@@ -2686,6 +2686,13 @@
)
targets.tests.gtest_test(
+ name = "webview_trichrome_64_cts_hostside_tests",
+ mixins = [
+ "webview_cts_archive",
+ ],
+)
+
+targets.tests.gtest_test(
name = "webview_trichrome_64_cts_tests_no_field_trial",
mixins = [
"webview_cts_archive",
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index 5f1737f..8b7393ce 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -9,6 +9,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12416,6 +12417,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12471,6 +12473,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12526,6 +12529,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12590,6 +12594,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12655,6 +12660,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12712,6 +12718,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12768,6 +12775,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12824,6 +12832,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -12883,16 +12892,17 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_trichrome_64_cts_tests"
+ "webview_trichrome_64_cts_hostside_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_trichrome_64_cts_tests",
+ "name": "webview_trichrome_64_cts_hostside_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -12934,75 +12944,10 @@
"name": "shard #${SHARD_INDEX} logcats"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 2
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
- "test": "webview_trichrome_64_cts_tests",
- "test_id_prefix": "ninja://android_webview/test:webview_trichrome_64_cts_tests/"
- },
- {
- "args": [
- "--disable-field-trial-config",
- "--gs-results-bucket=chromium-result-details",
- "--recover-devices",
- "--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
- ],
- "merge": {
- "args": [
- "--bucket",
- "chromium-result-details",
- "--test-name",
- "webview_trichrome_64_cts_tests_no_field_trial"
- ],
- "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
- },
- "name": "webview_trichrome_64_cts_tests_no_field_trial",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "chromium/android_webview/tools/cts_archive",
- "location": "android_webview/tools/cts_archive",
- "revision": "dMHDxWyIpkzGNem_Z7ywDRj3Y2lUQKM7h4JT87_ejr8C"
- }
- ],
- "dimensions": {
- "cores": "8",
- "cpu": "x86-64",
- "device_os": null,
- "device_type": null,
- "os": "Ubuntu-22.04",
- "pool": "chromium.tests.avd"
- },
- "named_caches": [
- {
- "name": "android_33_google_apis_x64",
- "path": ".android_emulator/android_33_google_apis_x64"
- }
- ],
- "optional_dimensions": {
- "60": {
- "caches": "android_33_google_apis_x64"
- }
- },
- "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",
- "shards": 2
- },
- "test": "webview_trichrome_64_cts_tests",
- "test_id_prefix": "ninja://android_webview/test:webview_trichrome_64_cts_tests/"
+ "test": "webview_trichrome_64_cts_hostside_tests",
+ "test_id_prefix": "ninja://android_webview/test:webview_trichrome_64_cts_hostside_tests/"
}
]
},
@@ -13014,6 +12959,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13078,6 +13024,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 12ce74f..461b71e 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -5528,6 +5528,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -5587,6 +5588,7 @@
"--gtest_filter=-All/ChromeBrowsingDataLifetimeManagerScheduledRemovalTest.History/*"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"experiment_percentage": 100,
"isolate_profile_data": true,
"merge": {
@@ -5649,6 +5651,7 @@
"--gtest_filter=-All/ChromeBrowsingDataLifetimeManagerScheduledRemovalTest.History/*"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"experiment_percentage": 100,
"isolate_profile_data": true,
"merge": {
@@ -5709,6 +5712,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -5767,6 +5771,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -5823,6 +5828,7 @@
"-v",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -5866,6 +5872,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.base_unittests.filter"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -5923,6 +5930,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -5980,6 +5988,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6037,6 +6046,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6094,6 +6104,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6151,6 +6162,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6209,6 +6221,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6266,6 +6279,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6324,6 +6338,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11_12.cc_unittests.filter"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6382,6 +6397,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"experiment_percentage": 100,
"isolate_profile_data": true,
"merge": {
@@ -6440,6 +6456,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6501,6 +6518,7 @@
"--timeout-scale=2.0"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"experiment_percentage": 100,
"isolate_profile_data": true,
"merge": {
@@ -6568,6 +6586,7 @@
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.chrome_public_unit_test_apk.filter"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6631,6 +6650,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6689,6 +6709,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gtest_filter=-FieldFormatterTest.DifferentLocales"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6749,6 +6770,7 @@
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.content_browsertests.filter"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"experiment_percentage": 100,
"isolate_profile_data": true,
"merge": {
@@ -6810,6 +6832,7 @@
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.content_shell_test_apk.filter"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6868,6 +6891,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6927,6 +6951,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.crashpad_tests.filter"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -6984,6 +7009,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7042,6 +7068,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.device_unittests.filter"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7099,6 +7126,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7157,6 +7185,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7214,6 +7243,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7271,6 +7301,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7328,6 +7359,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7385,6 +7417,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7444,6 +7477,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12_12l_13.gl_tests.filter"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7502,6 +7536,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.gl_unittests.filter"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7559,6 +7594,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7616,6 +7652,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7673,6 +7710,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7730,6 +7768,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7787,6 +7826,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7845,6 +7885,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7902,6 +7943,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -7959,6 +8001,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8017,6 +8060,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.media_unittests.filter"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8074,6 +8118,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8131,6 +8176,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"experiment_percentage": 100,
"isolate_profile_data": true,
"merge": {
@@ -8189,6 +8235,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8246,6 +8293,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8303,6 +8351,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8362,6 +8411,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gtest_filter=-ScopedDirTest.CloseOutOfScope"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8419,6 +8469,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8477,6 +8528,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gtest_filter=-PacLibraryTest.ActualPacMyIpAddress*"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8535,6 +8587,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8592,6 +8645,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8649,6 +8703,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8706,6 +8761,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8763,6 +8819,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8820,6 +8877,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8877,6 +8935,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8934,6 +8993,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -8991,6 +9051,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9048,6 +9109,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9106,6 +9168,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9163,6 +9226,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9220,6 +9284,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9278,6 +9343,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9336,6 +9402,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9394,6 +9461,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9463,6 +9531,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9531,6 +9600,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9596,6 +9666,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9655,6 +9726,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9712,6 +9784,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9769,6 +9842,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"args": [
@@ -9826,6 +9900,7 @@
"--use-persistent-shell",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"isolate_profile_data": true,
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -13528,6 +13603,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13584,6 +13660,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--gtest_filter=-OfferNotificationControllerAndroidBrowserTestForMessagesUi.MessageShown"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13641,6 +13718,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13696,6 +13774,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13750,6 +13829,7 @@
"-v",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
@@ -13791,6 +13871,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.base_unittests.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13846,6 +13927,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13901,6 +13983,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -13956,6 +14039,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14011,6 +14095,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14066,6 +14151,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14122,6 +14208,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14177,6 +14264,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14232,6 +14320,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14287,6 +14376,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14344,6 +14434,7 @@
"--git-revision=${got_revision}",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_13.chrome_public_test_apk.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14407,6 +14498,7 @@
"--git-revision=${got_revision}",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_13.chrome_public_unit_test_apk.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14468,6 +14560,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14523,6 +14616,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14580,6 +14674,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_13.content_browsertests.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14637,6 +14732,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_13.content_shell_test_apk.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14693,6 +14789,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14750,6 +14847,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.crashpad_tests.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14805,6 +14903,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14861,6 +14960,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.device_unittests.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14916,6 +15016,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -14972,6 +15073,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15027,6 +15129,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15082,6 +15185,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15137,6 +15241,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15192,6 +15297,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15249,6 +15355,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12_12l_13.gl_tests.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15304,6 +15411,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15359,6 +15467,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15414,6 +15523,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15469,6 +15579,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15524,6 +15635,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15579,6 +15691,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15635,6 +15748,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15690,6 +15804,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15745,6 +15860,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15801,6 +15917,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.media_unittests.filter"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15856,6 +15973,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15911,6 +16029,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -15966,6 +16085,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16021,6 +16141,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16078,6 +16199,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--gtest_filter=-ScopedDirTest.CloseOutOfScope"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16133,6 +16255,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16188,6 +16311,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16243,6 +16367,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16298,6 +16423,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16353,6 +16479,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16408,6 +16535,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16463,6 +16591,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16518,6 +16647,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16573,6 +16703,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16628,6 +16759,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16683,6 +16815,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16738,6 +16871,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16794,6 +16928,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16849,6 +16984,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16904,6 +17040,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -16960,6 +17097,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -17016,6 +17154,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -17072,6 +17211,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -17139,6 +17279,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -17204,6 +17345,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -17267,6 +17409,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -17322,6 +17465,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -17377,6 +17521,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21549,6 +21694,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21604,6 +21750,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21659,6 +21806,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21714,6 +21862,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21770,6 +21919,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--emulator-enable-network"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21826,6 +21976,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21881,6 +22032,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21936,6 +22088,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -21996,6 +22149,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -22051,6 +22205,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -22106,6 +22261,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -22161,6 +22317,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -22217,6 +22374,7 @@
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--emulator-enable-network"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -22273,6 +22431,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -22328,6 +22487,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -22383,6 +22543,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
],
+ "description": "Run with android_33_google_apis_x64",
"merge": {
"args": [
"--bucket",
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index f1f30ac1..b99d4ed 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -2503,6 +2503,7 @@
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
"ci_only": true,
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2558,6 +2559,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2616,6 +2618,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2674,6 +2677,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2730,6 +2734,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2790,6 +2795,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2850,6 +2856,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2907,6 +2914,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -2974,6 +2982,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3041,6 +3050,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3104,6 +3114,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3162,6 +3173,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3220,6 +3232,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3281,6 +3294,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3332,6 +3346,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3383,6 +3398,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3435,6 +3451,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -3486,6 +3503,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index b00754dc..e9f56d9 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -1940,6 +1940,19 @@
"label": "//android_webview/test:webview_instrumentation_test_apk",
"type": "console_test_launcher",
},
+ "webview_trichrome_64_cts_hostside_tests": {
+ "label": "//android_webview/test:webview_trichrome_64_cts_hostside_tests",
+ "type": "script",
+ "script": "//android_webview/tools/run_cts.py",
+ "args": [
+ "--cts-gcs-path",
+ "../../android_webview/tools/cts_config/webview_cts_hostside_gcs_path.json",
+ "--additional-apk",
+ "apks/TrichromeLibrary64.apk",
+ "--use-webview-provider",
+ "apks/TrichromeWebView64.apk",
+ ],
+ },
"webview_trichrome_64_cts_tests": {
"label": "//android_webview/test:webview_trichrome_64_cts_tests",
"type": "script",
diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl
index 8130237..69f5b2c 100644
--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -60,6 +60,7 @@
},
},
'12-x64-emulator': {
+ 'description': 'Run with android_31_google_apis_x64',
'args': [
'--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb',
],
@@ -132,6 +133,7 @@
},
},
'13-x64-emulator': {
+ 'description': 'Run with android_33_google_apis_x64',
'args': [
'--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb',
],
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 667086e..8013fc5 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -5476,6 +5476,14 @@
},
},
+ 'webview_trichrome_64_cts_hostside_tests': {
+ 'webview_trichrome_64_cts_hostside_tests': {
+ 'mixins': [
+ 'webview_cts_archive',
+ ],
+ },
+ },
+
'webview_trichrome_64_cts_tests': {
'webview_trichrome_64_cts_tests': {
'mixins': [
diff --git a/testing/buildbot/tryserver.chromium.android.json b/testing/buildbot/tryserver.chromium.android.json
index 3acae75..3d86bd5 100644
--- a/testing/buildbot/tryserver.chromium.android.json
+++ b/testing/buildbot/tryserver.chromium.android.json
@@ -9,6 +9,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -60,6 +61,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
@@ -111,6 +113,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
+ "description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 42b8125..126c1ad0 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -1188,7 +1188,7 @@
],
'os_type': 'android',
'test_suites': {
- 'gtest_tests': 'webview_trichrome_64_cts_gtests',
+ 'gtest_tests': 'webview_trichrome_64_cts_hostside_tests',
}
},
'android-webview-13-x64-dbg-tests': {