chromium/src
0
Fork 0
Code Activity

[infra] Migrate tests for Android chromium.fyi builders to starlark

Browse Source 
Bug: 40258588
Change-Id: I70cf13d280428db1e8d52c147a2069df2220fbcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5955235
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Auto-Submit: Wanda Mora <morawand@google.com>
Cr-Commit-Position: refs/heads/main@{#1372845}
This commit is contained in:
Wanda Mora
2024-10-23 18:16:55 +00:00
committed by Chromium LUCI CQ
parent 4622bed4da
commit 3f1ebb0475
24 changed files with 2310 additions and 1616 deletions

3
infra/config/generated/builders/ci/Site Isolation Android/properties.json

@ -41,7 +41,8 @@
"builder": "Site Isolation Android",
"project": "chromium"
}
]
],
"targets_spec_directory": "src/infra/config/generated/builders/ci/Site Isolation Android/targets"
}
},
"$build/reclient": {

253
infra/config/generated/builders/ci/Site Isolation Android/targets/chromium.fyi.json Normal file

@ -0,0 +1,253 @@
{
"Site Isolation Android": {
"additional_compile_targets": [
"content_browsertests",
"content_unittests"
],
"gtest_tests": [
{
"args": [
"--site-per-process"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_android_browsertests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "android_browsertests",
"test_id_prefix": "ninja://chrome/test:android_browsertests/"
},
{
"args": [
"--site-per-process",
"--git-revision=${got_revision}"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_chrome_public_test_apk",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test": "chrome_public_test_apk",
"test_id_prefix": "ninja://chrome/android:chrome_public_test_apk/"
},
{
"args": [
"--site-per-process",
"--git-revision=${got_revision}"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_chrome_public_unit_test_apk",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_public_unit_test_apk",
"test_id_prefix": "ninja://chrome/android:chrome_public_unit_test_apk/"
},
{
"args": [
"--site-per-process"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_components_browsertests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "components_browsertests",
"test_id_prefix": "ninja://components:components_browsertests/"
},
{
"args": [
"--site-per-process"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_components_unittests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 5
},
"test": "components_unittests",
"test_id_prefix": "ninja://components:components_unittests/"
},
{
"args": [
"--site-per-process",
"--test-launcher-filter-file=../../testing/buildbot/filters/site_isolation_android.content_browsertests.filter"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_content_browsertests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"args": [
"--site-per-process"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_content_shell_test_apk",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
},
"test": "content_shell_test_apk",
"test_id_prefix": "ninja://content/shell/android:content_shell_test_apk/"
},
{
"args": [
"--site-per-process"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_content_unittests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
},
{
"args": [
"--site-per-process"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "site_per_process_unit_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_type": "walleye",
"os": "Android",
"pool": "chromium.tests"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test": "unit_tests",
"test_id_prefix": "ninja://chrome/test:unit_tests/"
}
]
}
}

3
infra/config/generated/builders/ci/android-fieldtrial-rel/properties.json

@ -50,7 +50,8 @@
"builder": "android-fieldtrial-rel",
"group": "tryserver.chromium.android"
}
]
],
"targets_spec_directory": "src/infra/config/generated/builders/ci/android-fieldtrial-rel/targets"
}
},
"$build/reclient": {

664
infra/config/generated/builders/ci/android-fieldtrial-rel/targets/chromium.fyi.json Normal file

@ -0,0 +1,664 @@
{
"android-fieldtrial-rel": {
"gtest_tests": [
{
"args": [
"--disable-field-trial-config",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"ci_only": true,
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"android_browsertests_no_fieldtrial"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "android_browsertests_no_fieldtrial",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
},
"test": "android_browsertests",
"test_id_prefix": "ninja://chrome/test:android_browsertests/"
},
{
"args": [
"--webview-command-line-arg=--disable-field-trial-config",
"--webview-command-line-arg=--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"system_webview_shell_layout_test_apk Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "system_webview_shell_layout_test_apk Disable Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "system_webview_shell_layout_test_apk",
"test_id_prefix": "ninja://android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
"--webview-command-line-arg=--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"system_webview_shell_layout_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "system_webview_shell_layout_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "system_webview_shell_layout_test_apk",
"test_id_prefix": "ninja://android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
"--webview-command-line-arg=--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"system_webview_shell_layout_test_apk Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "system_webview_shell_layout_test_apk Single Group Per Study Prefer New Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "system_webview_shell_layout_test_apk",
"test_id_prefix": "ninja://android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
},
{
"args": [
"--use-apk-under-test-flags-file",
"--disable-field-trial-config",
"--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_instrumentation_test_apk Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_instrumentation_test_apk Disable Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_instrumentation_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_instrumentation_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_instrumentation_test_apk Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_instrumentation_test_apk Single Group Per Study Prefer New Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
},
{
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--disable-field-trial-config",
"--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_trichrome_64_cts_tests Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_trichrome_64_cts_tests Disable Field Trial Config",
"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/cipd",
"revision": "UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC"
}
],
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"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/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_trichrome_64_cts_tests Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_trichrome_64_cts_tests Single Group Per Study Prefer Existing Behavior Field Trial Config",
"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/cipd",
"revision": "UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC"
}
],
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"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/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_trichrome_64_cts_tests Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_trichrome_64_cts_tests Single Group Per Study Prefer New Behavior Field Trial Config",
"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/cipd",
"revision": "UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC"
}
],
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"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/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
},
{
"args": [
"--disable-field-trial-config",
"--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_ui_test_app_test_apk Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_ui_test_app_test_apk Disable Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webview_ui_test_app_test_apk",
"test_id_prefix": "ninja://android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_ui_test_app_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_ui_test_app_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webview_ui_test_app_test_apk",
"test_id_prefix": "ninja://android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_ui_test_app_test_apk Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_ui_test_app_test_apk Single Group Per Study Prefer New Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webview_ui_test_app_test_apk",
"test_id_prefix": "ninja://android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
}
]
}
}

3
infra/config/generated/builders/ci/android-perfetto-rel/properties.json

@ -49,7 +49,8 @@
"builder": "android-perfetto-rel",
"group": "tryserver.chromium.android"
}
]
],
"targets_spec_directory": "src/infra/config/generated/builders/ci/android-perfetto-rel/targets"
}
},
"$build/reclient": {

221
infra/config/generated/builders/ci/android-perfetto-rel/targets/chromium.fyi.json Normal file

@ -0,0 +1,221 @@
{
"android-perfetto-rel": {
"additional_compile_targets": [
"chrome_public_apk"
],
"gtest_tests": [
{
"args": [
"--gtest_filter=StartupMetricsTest.*",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"android_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "android_browsertests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "android_browsertests",
"test_id_prefix": "ninja://chrome/test:android_browsertests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"base_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "base_unittests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"content_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "content_browsertests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 15
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"perfetto_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "perfetto_unittests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "perfetto_unittests",
"test_id_prefix": "ninja://third_party/perfetto:perfetto_unittests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"services_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "services_unittests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "services_unittests",
"test_id_prefix": "ninja://services:services_unittests/"
}
]
}
}

3
infra/config/generated/builders/try/android-fieldtrial-rel/properties.json

@ -44,7 +44,8 @@
"builder": "android-fieldtrial-rel",
"project": "chromium"
}
]
],
"targets_spec_directory": "src/infra/config/generated/builders/try/android-fieldtrial-rel/targets"
}
},
"$build/reclient": {

664
infra/config/generated/builders/try/android-fieldtrial-rel/targets/chromium.fyi.json Normal file

@ -0,0 +1,664 @@
{
"android-fieldtrial-rel": {
"gtest_tests": [
{
"args": [
"--disable-field-trial-config",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"ci_only": true,
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"android_browsertests_no_fieldtrial"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "android_browsertests_no_fieldtrial",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
},
"test": "android_browsertests",
"test_id_prefix": "ninja://chrome/test:android_browsertests/"
},
{
"args": [
"--webview-command-line-arg=--disable-field-trial-config",
"--webview-command-line-arg=--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"system_webview_shell_layout_test_apk Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "system_webview_shell_layout_test_apk Disable Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "system_webview_shell_layout_test_apk",
"test_id_prefix": "ninja://android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
"--webview-command-line-arg=--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"system_webview_shell_layout_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "system_webview_shell_layout_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "system_webview_shell_layout_test_apk",
"test_id_prefix": "ninja://android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
"--webview-command-line-arg=--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"system_webview_shell_layout_test_apk Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "system_webview_shell_layout_test_apk Single Group Per Study Prefer New Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "system_webview_shell_layout_test_apk",
"test_id_prefix": "ninja://android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
},
{
"args": [
"--use-apk-under-test-flags-file",
"--disable-field-trial-config",
"--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_instrumentation_test_apk Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_instrumentation_test_apk Disable Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_instrumentation_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_instrumentation_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_instrumentation_test_apk Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_instrumentation_test_apk Single Group Per Study Prefer New Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
},
{
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--disable-field-trial-config",
"--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_trichrome_64_cts_tests Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_trichrome_64_cts_tests Disable Field Trial Config",
"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/cipd",
"revision": "UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC"
}
],
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"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/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_trichrome_64_cts_tests Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_trichrome_64_cts_tests Single Group Per Study Prefer Existing Behavior Field Trial Config",
"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/cipd",
"revision": "UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC"
}
],
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"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/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_trichrome_64_cts_tests Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_trichrome_64_cts_tests Single Group Per Study Prefer New Behavior Field Trial Config",
"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/cipd",
"revision": "UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC"
}
],
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"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/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
},
{
"args": [
"--disable-field-trial-config",
"--webview-verbose-logging",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_ui_test_app_test_apk Disable Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_ui_test_app_test_apk Disable Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webview_ui_test_app_test_apk",
"test_id_prefix": "ninja://android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk/",
"variant_id": "Disable Field Trial Config"
},
{
"args": [
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_ui_test_app_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_ui_test_app_test_apk Single Group Per Study Prefer Existing Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webview_ui_test_app_test_apk",
"test_id_prefix": "ninja://android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk/",
"variant_id": "Single Group Per Study Prefer Existing Behavior Field Trial Config"
},
{
"args": [
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
"--fake-variations-channel=stable",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_ui_test_app_test_apk Single Group Per Study Prefer New Behavior Field Trial Config"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webview_ui_test_app_test_apk Single Group Per Study Prefer New Behavior Field Trial Config",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
},
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Ubuntu-22.04",
"pool": "chromium.tests.finch"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webview_ui_test_app_test_apk",
"test_id_prefix": "ninja://android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk/",
"variant_id": "Single Group Per Study Prefer New Behavior Field Trial Config"
}
]
}
}

3
infra/config/generated/builders/try/android-perfetto-rel/properties.json

@ -43,7 +43,8 @@
"builder": "android-perfetto-rel",
"project": "chromium"
}
]
],
"targets_spec_directory": "src/infra/config/generated/builders/try/android-perfetto-rel/targets"
}
},
"$build/reclient": {

221
infra/config/generated/builders/try/android-perfetto-rel/targets/chromium.fyi.json Normal file

@ -0,0 +1,221 @@
{
"android-perfetto-rel": {
"additional_compile_targets": [
"chrome_public_apk"
],
"gtest_tests": [
{
"args": [
"--gtest_filter=StartupMetricsTest.*",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"android_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "android_browsertests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "android_browsertests",
"test_id_prefix": "ninja://chrome/test:android_browsertests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"base_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "base_unittests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"content_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "content_browsertests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 15
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"perfetto_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "perfetto_unittests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "perfetto_unittests",
"test_id_prefix": "ninja://third_party/perfetto:perfetto_unittests/"
},
{
"args": [
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"description": "Run with android_31_google_apis_x64",
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"services_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "services_unittests",
"swarming": {
"dimensions": {
"cores": "8",
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-22.04",
"pool": "chromium.tests.avd"
},
"named_caches": [
{
"name": "android_31_google_apis_x64",
"path": ".android_emulator/android_31_google_apis_x64"
}
],
"optional_dimensions": {
"60": {
"caches": "android_31_google_apis_x64"
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "services_unittests",
"test_id_prefix": "ninja://services:services_unittests/"
}
]
}
}

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

@ -490,6 +490,7 @@
"chrome_public_test_apk": {
"label": "//chrome/android:chrome_public_test_apk",
"type": "console_test_launcher",
"skip_usage_check": True,
},
"chrome_public_test_vr_apk": {
"label": "//chrome/android:chrome_public_test_vr_apk",
@ -499,6 +500,7 @@
"chrome_public_unit_test_apk": {
"label": "//chrome/android:chrome_public_unit_test_apk",
"type": "console_test_launcher",
"skip_usage_check": True,
},
"chrome_public_wpt": {
"label": "//chrome/android:chrome_public_wpt",
@ -685,6 +687,7 @@
"content_shell_test_apk": {
"label": "//content/shell/android:content_shell_test_apk",
"type": "console_test_launcher",
"skip_usage_check": True,
},
"content_unittests": {
"label": "//content/test:content_unittests",
@ -1635,6 +1638,7 @@
"system_webview_shell_layout_test_apk": {
"label": "//android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk",
"type": "console_test_launcher",
"skip_usage_check": True,
},
"system_webview_wpt": {
"label": "//android_webview/test:system_webview_wpt",
@ -2078,6 +2082,7 @@
"label": "//android_webview/test:webview_trichrome_64_cts_tests",
"type": "script",
"script": "//android_webview/tools/run_cts.py",
"skip_usage_check": True,
"args": [
"--skip-expected-failures",
"--additional-apk",
@ -2114,6 +2119,7 @@
"webview_ui_test_app_test_apk": {
"label": "//android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk",
"type": "console_test_launcher",
"skip_usage_check": True,
},
"wm_unittests": {
"label": "//ui/wm:wm_unittests",

11
infra/config/generated/testing/mixins.pyl

@ -725,17 +725,6 @@
'--use-webgpu-power-preference=default-high-performance',
],
},
'webview_cts_archive': {
'swarming': {
'cipd_packages': [
{
'cipd_package': 'chromium/android_webview/tools/cts_archive',
'location': 'android_webview/tools/cts_archive/cipd',
'revision': 'UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC',
},
],
},
},
'win-arm64': {
'swarming': {
'dimensions': {

203
infra/config/generated/testing/test_suites.pyl

@ -1330,21 +1330,6 @@
},
},
'fieldtrial_android_tests': {
'android_browsertests_no_fieldtrial': {
'test_common': {
'args': [
'--disable-field-trial-config',
],
},
'test': 'android_browsertests',
'ci_only': True,
'swarming': {
'shards': 3,
},
},
},
'fieldtrial_browser_tests': {
'browser_tests_no_field_trial': {
'test_common': {
@ -3333,25 +3318,6 @@
'services_unittests': {},
},
'perfetto_gtests_android': {
'android_browsertests': {
'args': [
'--gtest_filter=StartupMetricsTest.*',
],
},
'base_unittests': {},
'content_browsertests': {
'swarming': {
'shards': 8,
},
'android_swarming': {
'shards': 15,
},
},
'perfetto_unittests': {},
'services_unittests': {},
},
'pixel_browser_tests_gtests': {
'pixel_browser_tests': {
'test_common': {
@ -3402,107 +3368,6 @@
},
},
'site_isolation_android_fyi_gtests': {
'site_per_process_android_browsertests': {
'test_common': {
'args': [
'--site-per-process',
],
},
'test': 'android_browsertests',
'swarming': {
'shards': 1,
},
},
'site_per_process_chrome_public_test_apk': {
'test_common': {
'mixins': [
'skia_gold_test',
'has_native_resultdb_integration',
],
'args': [
'--site-per-process',
],
},
'test': 'chrome_public_test_apk',
'swarming': {
'shards': 20,
},
},
'site_per_process_chrome_public_unit_test_apk': {
'test_common': {
'mixins': [
'skia_gold_test',
],
'args': [
'--site-per-process',
],
},
'test': 'chrome_public_unit_test_apk',
},
'site_per_process_components_browsertests': {
'test_common': {
'args': [
'--site-per-process',
],
},
'test': 'components_browsertests',
},
'site_per_process_components_unittests': {
'test_common': {
'args': [
'--site-per-process',
],
},
'test': 'components_unittests',
'swarming': {
'shards': 5,
},
},
'site_per_process_content_browsertests': {
'test_common': {
'args': [
'--site-per-process',
'--test-launcher-filter-file=../../testing/buildbot/filters/site_isolation_android.content_browsertests.filter',
],
},
'test': 'content_browsertests',
'swarming': {
'shards': 10,
},
},
'site_per_process_content_shell_test_apk': {
'test_common': {
'args': [
'--site-per-process',
],
},
'test': 'content_shell_test_apk',
'swarming': {
'shards': 3,
},
},
'site_per_process_content_unittests': {
'test_common': {
'args': [
'--site-per-process',
],
},
'test': 'content_unittests',
},
'site_per_process_unit_tests': {
'test_common': {
'args': [
'--site-per-process',
],
},
'test': 'unit_tests',
'swarming': {
'shards': 10,
},
},
},
'swangle_gtests': {
'angle_deqp_egl_tests': {
'args': [
@ -3599,10 +3464,6 @@
},
},
'system_webview_shell_instrumentation_tests': {
'system_webview_shell_layout_test_apk': {},
},
'telemetry_desktop_minidump_unittests_isolated_scripts': {
'telemetry_desktop_minidump_unittests': {
'test_common': {
@ -3879,17 +3740,6 @@
},
},
'webview_bot_instrumentation_test_apk_gtest': {
'webview_instrumentation_test_apk': {
'args': [
'--use-apk-under-test-flags-file',
],
'swarming': {
'shards': 12,
},
},
},
'webview_instrumentation_test_apk_single_process_mode_gtests': {
'webview_instrumentation_test_apk_single_process_mode': {
'test_common': {
@ -3904,27 +3754,6 @@
},
},
'webview_trichrome_64_cts_field_trial_tests': {
'webview_trichrome_64_cts_tests': {
'test_common': {
'mixins': [
'webview_cts_archive',
],
},
'args': [
'--store-data-dependencies-in-temp',
'--store-tombstones',
],
'swarming': {
'shards': 2,
},
},
},
'webview_ui_instrumentation_tests': {
'webview_ui_test_app_test_apk': {},
},
'win_specific_chromium_gtests': {
'chrome_elf_unittests': {},
'delayloads_unittests': {},
@ -4239,38 +4068,6 @@
'matrix_compound_suites': {
'android_fieldtrial_rel_webview_tests': {
'fieldtrial_android_tests': {},
'system_webview_shell_instrumentation_tests': {
'variants': [
'DISABLE_FIELD_TRIAL_CONFIG_WEBVIEW_COMMANDLINE',
'SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR_WEBVIEW_COMMANDLINE',
'SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR_WEBVIEW_COMMANDLINE',
],
},
'webview_bot_instrumentation_test_apk_gtest': {
'variants': [
'DISABLE_FIELD_TRIAL_CONFIG',
'SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR',
'SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR',
],
},
'webview_trichrome_64_cts_field_trial_tests': {
'variants': [
'DISABLE_FIELD_TRIAL_CONFIG',
'SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR',
'SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR',
],
},
'webview_ui_instrumentation_tests': {
'variants': [
'DISABLE_FIELD_TRIAL_CONFIG',
'SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR',
'SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR',
],
},
},
'chromeos_brya_skylab_tests': {
'chromeos_chrome_all_tast_tests': {
'variants': [

54
infra/config/generated/testing/variants.pyl

@ -68,20 +68,6 @@
'public_builder_bucket': 'testplatform-public',
},
},
'DISABLE_FIELD_TRIAL_CONFIG': {
'identifier': 'Disable Field Trial Config',
'args': [
'--disable-field-trial-config',
'--webview-verbose-logging',
],
},
'DISABLE_FIELD_TRIAL_CONFIG_WEBVIEW_COMMANDLINE': {
'identifier': 'Disable Field Trial Config',
'args': [
'--webview-command-line-arg=--disable-field-trial-config',
'--webview-command-line-arg=--webview-verbose-logging',
],
},
'INTEL_UHD_630_OR_770': {
'identifier': 'Intel UHD 630 or 770',
'mixins': [
@ -148,46 +134,6 @@
'ios_runtime_cache_18_0',
],
},
'SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR': {
'identifier': 'Single Group Per Study Prefer Existing Behavior Field Trial Config',
'args': [
'--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json',
'--accept-empty-variations-seed-signature',
'--webview-verbose-logging',
'--disable-field-trial-config',
'--fake-variations-channel=stable',
],
},
'SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR_WEBVIEW_COMMANDLINE': {
'identifier': 'Single Group Per Study Prefer Existing Behavior Field Trial Config',
'args': [
'--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json',
'--webview-command-line-arg=--accept-empty-variations-seed-signature',
'--webview-command-line-arg=--webview-verbose-logging',
'--webview-command-line-arg=--disable-field-trial-config',
'--webview-command-line-arg=--fake-variations-channel=stable',
],
},
'SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR': {
'identifier': 'Single Group Per Study Prefer New Behavior Field Trial Config',
'args': [
'--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json',
'--accept-empty-variations-seed-signature',
'--webview-verbose-logging',
'--disable-field-trial-config',
'--fake-variations-channel=stable',
],
},
'SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR_WEBVIEW_COMMANDLINE': {
'identifier': 'Single Group Per Study Prefer New Behavior Field Trial Config',
'args': [
'--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json',
'--webview-command-line-arg=--accept-empty-variations-seed-signature',
'--webview-command-line-arg=--webview-verbose-logging',
'--webview-command-line-arg=--disable-field-trial-config',
'--webview-command-line-arg=--fake-variations-channel=stable',
],
},
'WIN10_INTEL_UHD_630_STABLE': {
'identifier': '8086:9bc5',
'mixins': [

77
infra/config/subprojects/chromium/ci/chromium.fyi.star

@ -63,11 +63,28 @@ consoles.console_view(
"buildperf",
],
"code_coverage": consoles.ordering(
short_names = ["and", "ann", "lnx", "lcr", "jcr", "mac"],
short_names = [
"and",
"ann",
"lnx",
"lcr",
"jcr",
"mac",
],
),
"mac": consoles.ordering(short_names = ["bld", "15", "herm"]),
"deterministic|mac": consoles.ordering(short_names = ["rel", "dbg"]),
"iOS|iOS13": consoles.ordering(short_names = ["dev", "sim"]),
"mac": consoles.ordering(short_names = [
"bld",
"15",
"herm",
]),
"deterministic|mac": consoles.ordering(short_names = [
"rel",
"dbg",
]),
"iOS|iOS13": consoles.ordering(short_names = [
"dev",
"sim",
]),
"linux|blink": consoles.ordering(short_names = ["TD"]),
},
)
@ -167,6 +184,26 @@ ci.builder(
"strip_debug_info",
],
),
targets = targets.bundle(
targets = [
"site_isolation_android_fyi_gtests",
],
additional_compile_targets = [
"content_browsertests",
"content_unittests",
],
mixins = [
targets.mixin(
swarming = targets.swarming(
dimensions = {
"os": "Android",
},
),
),
"chromium_pixel_2_pie",
"has_native_resultdb_integration",
],
),
os = os.LINUX_DEFAULT,
console_view_entry = consoles.console_view_entry(
category = "site_isolation",
@ -589,6 +626,21 @@ ci.builder(
"webview_shell",
],
),
targets = targets.bundle(
targets = [
"android_fieldtrial_rel_webview_tests",
],
mixins = [
"12-x64-emulator",
"has_native_resultdb_integration",
"finch-chromium-swarming-pool",
"linux-jammy",
"x86-64",
],
),
targets_settings = targets.settings(
os_type = targets.os_type.ANDROID,
),
builderless = False,
os = os.LINUX_DEFAULT,
console_view_entry = consoles.console_view_entry(
@ -678,6 +730,23 @@ ci.builder(
"x64",
],
),
targets = targets.bundle(
targets = [
"perfetto_gtests_android",
],
additional_compile_targets = [
"chrome_public_apk",
],
mixins = [
"12-x64-emulator",
"emulator-8-cores",
"linux-jammy",
"x86-64",
],
),
targets_settings = targets.settings(
os_type = targets.os_type.ANDROID,
),
builderless = True,
os = os.LINUX_DEFAULT,
console_view_entry = consoles.console_view_entry(

116
infra/config/targets/basic_suites.star

@ -1012,18 +1012,6 @@ targets.legacy_basic_suite(
},
)
targets.legacy_basic_suite(
name = "fieldtrial_android_tests",
tests = {
"android_browsertests_no_fieldtrial": targets.legacy_test_config(
ci_only = True,
swarming = targets.swarming(
shards = 3,
),
),
},
)
targets.legacy_basic_suite(
name = "fieldtrial_browser_tests",
tests = {
@ -2637,28 +2625,6 @@ targets.legacy_basic_suite(
},
)
targets.legacy_basic_suite(
name = "perfetto_gtests_android",
tests = {
"android_browsertests": targets.legacy_test_config(
args = [
"--gtest_filter=StartupMetricsTest.*",
],
),
"base_unittests": targets.legacy_test_config(),
"content_browsertests": targets.legacy_test_config(
swarming = targets.swarming(
shards = 8,
),
android_swarming = targets.swarming(
shards = 15,
),
),
"perfetto_unittests": targets.legacy_test_config(),
"services_unittests": targets.legacy_test_config(),
},
)
targets.legacy_basic_suite(
name = "pixel_browser_tests_gtests",
tests = {
@ -2680,45 +2646,6 @@ targets.legacy_basic_suite(
},
)
targets.legacy_basic_suite(
name = "site_isolation_android_fyi_gtests",
tests = {
"site_per_process_android_browsertests": targets.legacy_test_config(
swarming = targets.swarming(
shards = 1,
),
),
"site_per_process_chrome_public_test_apk": targets.legacy_test_config(
swarming = targets.swarming(
shards = 20,
),
),
"site_per_process_chrome_public_unit_test_apk": targets.legacy_test_config(),
"site_per_process_components_browsertests": targets.legacy_test_config(),
"site_per_process_components_unittests": targets.legacy_test_config(
swarming = targets.swarming(
shards = 5,
),
),
"site_per_process_content_browsertests": targets.legacy_test_config(
swarming = targets.swarming(
shards = 10,
),
),
"site_per_process_content_shell_test_apk": targets.legacy_test_config(
swarming = targets.swarming(
shards = 3,
),
),
"site_per_process_content_unittests": targets.legacy_test_config(),
"site_per_process_unit_tests": targets.legacy_test_config(
swarming = targets.swarming(
shards = 10,
),
),
},
)
targets.legacy_basic_suite(
name = "swangle_gtests",
tests = {
@ -2818,13 +2745,6 @@ targets.legacy_basic_suite(
},
)
targets.legacy_basic_suite(
name = "system_webview_shell_instrumentation_tests",
tests = {
"system_webview_shell_layout_test_apk": targets.legacy_test_config(),
},
)
targets.legacy_basic_suite(
name = "telemetry_desktop_minidump_unittests_isolated_scripts",
tests = {
@ -3056,20 +2976,6 @@ targets.legacy_basic_suite(
},
)
targets.legacy_basic_suite(
name = "webview_bot_instrumentation_test_apk_gtest",
tests = {
"webview_instrumentation_test_apk": targets.legacy_test_config(
args = [
"--use-apk-under-test-flags-file",
],
swarming = targets.swarming(
shards = 12,
),
),
},
)
# This target is only to run on Android versions <= Android Q (10).
targets.legacy_basic_suite(
name = "webview_instrumentation_test_apk_single_process_mode_gtests",
@ -3082,28 +2988,6 @@ targets.legacy_basic_suite(
},
)
targets.legacy_basic_suite(
name = "webview_trichrome_64_cts_field_trial_tests",
tests = {
"webview_trichrome_64_cts_tests": targets.legacy_test_config(
args = [
"--store-data-dependencies-in-temp",
"--store-tombstones",
],
swarming = targets.swarming(
shards = 2,
),
),
},
)
targets.legacy_basic_suite(
name = "webview_ui_instrumentation_tests",
tests = {
"webview_ui_test_app_test_apk": targets.legacy_test_config(),
},
)
targets.legacy_basic_suite(
name = "win_specific_chromium_gtests",
tests = {

12
infra/config/targets/binaries.star

@ -473,6 +473,8 @@ targets.binaries.console_test_launcher(
targets.binaries.console_test_launcher(
name = "chrome_public_test_apk",
label = "//chrome/android:chrome_public_test_apk",
# All references have been moved to starlark
skip_usage_check = True,
)
targets.binaries.console_test_launcher(
@ -485,6 +487,8 @@ targets.binaries.console_test_launcher(
targets.binaries.console_test_launcher(
name = "chrome_public_unit_test_apk",
label = "//chrome/android:chrome_public_unit_test_apk",
# All references have been moved to starlark
skip_usage_check = True,
)
targets.binaries.generated_script(
@ -686,6 +690,8 @@ targets.binaries.script(
targets.binaries.console_test_launcher(
name = "content_shell_test_apk",
label = "//content/shell/android:content_shell_test_apk",
# All references have been moved to starlark
skip_usage_check = True,
)
targets.binaries.windowed_test_launcher(
@ -1777,6 +1783,8 @@ targets.binaries.script(
targets.binaries.console_test_launcher(
name = "system_webview_shell_layout_test_apk",
label = "//android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk",
# All references have been moved to starlark
skip_usage_check = True,
)
targets.binaries.generated_script(
@ -2285,6 +2293,8 @@ targets.binaries.script(
name = "webview_trichrome_64_cts_tests",
label = "//android_webview/test:webview_trichrome_64_cts_tests",
script = "//android_webview/tools/run_cts.py",
# All references have been moved to starlark
skip_usage_check = True,
args = [
"--skip-expected-failures",
"--additional-apk",
@ -2348,6 +2358,8 @@ targets.binaries.console_test_launcher(
targets.binaries.console_test_launcher(
name = "webview_ui_test_app_test_apk",
label = "//android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk",
# All references have been moved to starlark
skip_usage_check = True,
)
targets.binaries.windowed_test_launcher(

176
infra/config/targets/bundles.star

@ -401,6 +401,45 @@ targets.bundle(
],
)
targets.bundle(
name = "android_fieldtrial_rel_webview_tests",
targets = [
"fieldtrial_android_tests",
targets.bundle(
targets = "system_webview_shell_instrumentation_tests",
variants = [
"DISABLE_FIELD_TRIAL_CONFIG_WEBVIEW_COMMANDLINE",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR_WEBVIEW_COMMANDLINE",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR_WEBVIEW_COMMANDLINE",
],
),
targets.bundle(
targets = "webview_bot_instrumentation_test_apk_gtest",
variants = [
"DISABLE_FIELD_TRIAL_CONFIG",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR",
],
),
targets.bundle(
targets = "webview_trichrome_64_cts_field_trial_tests",
variants = [
"DISABLE_FIELD_TRIAL_CONFIG",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR",
],
),
targets.bundle(
targets = "webview_ui_instrumentation_tests",
variants = [
"DISABLE_FIELD_TRIAL_CONFIG",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR",
],
),
],
)
# Test suites that need to run on hardware that is close to real Android device.
# See https://crbug.com/40204012#comment5 for details.
targets.bundle(
@ -1767,6 +1806,21 @@ targets.bundle(
},
)
targets.bundle(
name = "fieldtrial_android_tests",
targets = [
"android_browsertests_no_fieldtrial",
],
per_test_modifications = {
"android_browsertests_no_fieldtrial": targets.mixin(
ci_only = True,
swarming = targets.swarming(
shards = 3,
),
),
},
)
targets.bundle(
name = "fieldtrial_ios_simulator_tests",
targets = [
@ -4102,6 +4156,32 @@ targets.bundle(
],
)
targets.bundle(
name = "perfetto_gtests_android",
targets = [
"android_browsertests",
"base_unittests",
"content_browsertests",
"perfetto_unittests",
"services_unittests",
],
per_test_modifications = {
"android_browsertests": targets.mixin(
args = [
"--gtest_filter=StartupMetricsTest.*",
],
),
"content_browsertests": targets.mixin(
swarming = targets.swarming(
shards = 8,
),
android_swarming = targets.swarming(
shards = 15,
),
),
},
)
targets.bundle(
name = "performance_smoke_test_isolated_scripts",
targets = [
@ -4176,6 +4256,60 @@ targets.bundle(
],
)
targets.bundle(
name = "site_isolation_android_fyi_gtests",
targets = [
"site_per_process_android_browsertests",
"site_per_process_chrome_public_test_apk",
"site_per_process_chrome_public_unit_test_apk",
"site_per_process_components_browsertests",
"site_per_process_components_unittests",
"site_per_process_content_browsertests",
"site_per_process_content_shell_test_apk",
"site_per_process_content_unittests",
"site_per_process_unit_tests",
],
per_test_modifications = {
"site_per_process_android_browsertests": targets.mixin(
swarming = targets.swarming(
shards = 1,
),
),
"site_per_process_chrome_public_test_apk": targets.mixin(
swarming = targets.swarming(
shards = 20,
),
),
"site_per_process_components_unittests": targets.mixin(
swarming = targets.swarming(
shards = 5,
),
),
"site_per_process_content_browsertests": targets.mixin(
swarming = targets.swarming(
shards = 10,
),
),
"site_per_process_content_shell_test_apk": targets.mixin(
swarming = targets.swarming(
shards = 3,
),
),
"site_per_process_unit_tests": targets.mixin(
swarming = targets.swarming(
shards = 10,
),
),
},
)
targets.bundle(
name = "system_webview_shell_instrumentation_tests",
targets = [
"system_webview_shell_layout_test_apk",
],
)
targets.bundle(
name = "system_webview_wpt_suite",
targets = "system_webview_wpt",
@ -4276,6 +4410,23 @@ targets.bundle(
],
)
targets.bundle(
name = "webview_bot_instrumentation_test_apk_gtest",
targets = [
"webview_instrumentation_test_apk",
],
per_test_modifications = {
"webview_instrumentation_test_apk": targets.mixin(
args = [
"--use-apk-under-test-flags-file",
],
swarming = targets.swarming(
shards = 12,
),
),
},
)
targets.bundle(
name = "webview_bot_instrumentation_test_apk_mutations_gtest",
targets = [
@ -4399,6 +4550,24 @@ targets.bundle(
},
)
targets.bundle(
name = "webview_trichrome_64_cts_field_trial_tests",
targets = [
"webview_trichrome_64_cts_tests",
],
per_test_modifications = {
"webview_trichrome_64_cts_tests": targets.mixin(
args = [
"--store-data-dependencies-in-temp",
"--store-tombstones",
],
swarming = targets.swarming(
shards = 2,
),
),
},
)
targets.bundle(
name = "webview_trichrome_64_cts_gtests",
targets = [
@ -4462,6 +4631,13 @@ targets.bundle(
},
)
targets.bundle(
name = "webview_ui_instrumentation_tests",
targets = [
"webview_ui_test_app_test_apk",
],
)
targets.bundle(
name = "webview_ui_instrumentation_tests_no_field_trial",
targets = [

35
infra/config/targets/matrix_compound_suites.star

@ -11,41 +11,6 @@
load("//lib/targets.star", "targets")
targets.legacy_matrix_compound_suite(
name = "android_fieldtrial_rel_webview_tests",
basic_suites = {
"fieldtrial_android_tests": None,
"webview_bot_instrumentation_test_apk_gtest": targets.legacy_matrix_config(
variants = [
"DISABLE_FIELD_TRIAL_CONFIG",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR",
],
),
"webview_trichrome_64_cts_field_trial_tests": targets.legacy_matrix_config(
variants = [
"DISABLE_FIELD_TRIAL_CONFIG",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR",
],
),
"webview_ui_instrumentation_tests": targets.legacy_matrix_config(
variants = [
"DISABLE_FIELD_TRIAL_CONFIG",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR",
],
),
"system_webview_shell_instrumentation_tests": targets.legacy_matrix_config(
variants = [
"DISABLE_FIELD_TRIAL_CONFIG_WEBVIEW_COMMANDLINE",
"SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR_WEBVIEW_COMMANDLINE",
"SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR_WEBVIEW_COMMANDLINE",
],
),
},
)
targets.legacy_matrix_compound_suite(
name = "chromeos_vmlab_tests",
basic_suites = {

1
infra/config/targets/mixins.star

@ -1904,6 +1904,7 @@ targets.mixin(
targets.mixin(
name = "webview_cts_archive",
generate_pyl_entry = False,
swarming = targets.swarming(
cipd_packages = [
targets.cipd_package(

6
infra/config/targets/variants.star

@ -15,6 +15,7 @@ targets.variant(
targets.variant(
name = "DISABLE_FIELD_TRIAL_CONFIG",
identifier = "Disable Field Trial Config",
generate_pyl_entry = False,
args = [
"--disable-field-trial-config",
"--webview-verbose-logging",
@ -24,6 +25,7 @@ targets.variant(
targets.variant(
name = "DISABLE_FIELD_TRIAL_CONFIG_WEBVIEW_COMMANDLINE",
identifier = "Disable Field Trial Config",
generate_pyl_entry = False,
args = [
"--webview-command-line-arg=--disable-field-trial-config",
"--webview-command-line-arg=--webview-verbose-logging",
@ -33,6 +35,7 @@ targets.variant(
targets.variant(
name = "SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR",
identifier = "Single Group Per Study Prefer Existing Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
@ -45,6 +48,7 @@ targets.variant(
targets.variant(
name = "SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR",
identifier = "Single Group Per Study Prefer New Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
@ -57,6 +61,7 @@ targets.variant(
targets.variant(
name = "SINGLE_GROUP_PER_STUDY_PREFER_EXISTING_BEHAVIOR_WEBVIEW_COMMANDLINE",
identifier = "Single Group Per Study Prefer Existing Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
@ -69,6 +74,7 @@ targets.variant(
targets.variant(
name = "SINGLE_GROUP_PER_STUDY_PREFER_NEW_BEHAVIOR_WEBVIEW_COMMANDLINE",
identifier = "Single Group Per Study Prefer New Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--webview-variations-test-seed-path=../../third_party/chromium-variations/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",

1132
testing/buildbot/chromium.fyi.json

File diff suppressed because it is too large Load Diff

11
testing/buildbot/mixins.pyl

@ -725,17 +725,6 @@
'--use-webgpu-power-preference=default-high-performance',
],
},
'webview_cts_archive': {
'swarming': {
'cipd_packages': [
{
'cipd_package': 'chromium/android_webview/tools/cts_archive',
'location': 'android_webview/tools/cts_archive/cipd',
'revision': 'UYQZhJpB3MWpJIAcesI-M1bqRoTghiKCYr_SD9tPDewC',
},
],
},
},
'win-arm64': {
'swarming': {
'dimensions': {

48
testing/buildbot/waterfalls.pyl

@ -791,6 +791,8 @@
# The following builders in this group have been migrated to set their
# targets in the builders' declarations in
# //infra/config/subprojects/ci/chromium.fyi.star
# android-fieldtrial-rel
# android-perfetto-rel
# ios-blink-dbg-fyi
# ios-fieldtrial-rel
# ios-m1-simulator
@ -821,6 +823,7 @@
# mac-osxbeta-rel
# mac-perfetto-rel
# mac13-wpt-chromium-rel
# Site Isolation Android
'name': 'chromium.fyi',
'mixins': ['chromium-tester-service-account'],
'machines': {
@ -884,24 +887,6 @@
'xctest',
],
},
'Site Isolation Android': {
'additional_compile_targets': [
'content_browsertests',
'content_unittests',
],
'swarming': {
'dimensions': {
'os': 'Android',
},
},
'test_suites': {
'gtest_tests': 'site_isolation_android_fyi_gtests',
},
'mixins': [
'chromium_pixel_2_pie',
'has_native_resultdb_integration',
],
},
'Win 10 Fast Ring': {
'test_suites': {
'gtest_tests': 'chromium_win_gtests',
@ -968,33 +953,6 @@
'scripts': 'chromium_win_scripts',
},
},
'android-fieldtrial-rel': {
'mixins': [
'12-x64-emulator',
'has_native_resultdb_integration',
'finch-chromium-swarming-pool',
'linux-jammy',
'x86-64',
],
'os_type': 'android',
'test_suites': {
'gtest_tests': 'android_fieldtrial_rel_webview_tests',
},
},
'android-perfetto-rel': {
'additional_compile_targets': [ 'chrome_public_apk' ],
'mixins': [
'12-x64-emulator',
'emulator-8-cores',
'linux-jammy',
'x86-64',
],
'os_type': 'android',
'test_suites': {
'gtest_tests': 'perfetto_gtests_android',
},
},
'win-annotator-rel': {
'test_suites': {
'scripts': 'test_traffic_annotation_auditor_script',