chromium/src
0
Fork 0
Code Activity

Add LUCI, mb, and test configs for android-12-x64-rel

Browse Source 
This is a production version of the FYI builder android-12-x64-fyi-rel
with the following differences:
1. The trybot is migrated to orchestrator (pool already allocated).
2. chrome_public_test_apk is marked as ci_only and experimental.

The FYI builder's mb & test configs are removed, and LUCI config is kept
so that the build links in the related bugs are accessible.

Bug: 1225851
Change-Id: I59be4a8f32caebe9449373296d1257b42139079a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3496937
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#977015}
This commit is contained in:
Haiyang Pan
2022-03-03 08:18:33 +00:00
committed by Chromium LUCI CQ
parent 5a2e973e6a
commit 2a55a45d52
20 changed files with 5145 additions and 4886 deletions

6
docs/android_emulator.md

@ -34,15 +34,15 @@ tools/android/avd/avd.py list
| `generic_android29.textpb` | 10 (Q) | google_apis | N/A |
| `generic_android30.textpb` | 11 (R) | google_apis | [android-11-x86-rel][android-11-x86-rel] |
| `generic_playstore_android30.textpb` | 11 (R) | google_apis_playstore | [android-11-x86-rel][android-11-x86-rel] |
| `generic_android31.textpb` | 12 (S) | google_apis | [android-12-x64-fyi-rel][android-12-x64-fyi-rel] |
| `generic_playstore_android31.textpb` | 12 (S) | google_apis_playstore | [android-12-x64-fyi-rel][android-12-x64-fyi-rel] |
| `generic_android31.textpb` | 12 (S) | google_apis | [android-12-x64-rel][android-12-x64-rel] |
| `generic_playstore_android31.textpb` | 12 (S) | google_apis_playstore | [android-12-x64-rel][android-12-x64-rel] |
You can use these configuration files to run the same emulator images locally.
[android-marshmallow-x86-rel]: https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-rel
[android-pie-x86-rel]: https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-rel
[android-11-x86-rel]: https://ci.chromium.org/p/chromium/builders/ci/android-11-x86-rel
[android-12-x64-fyi-rel]: https://ci.chromium.org/p/chromium/builders/ci/android-12-x64-fyi-rel
[android-12-x64-rel]: https://ci.chromium.org/p/chromium/builders/ci/android-12-x64-rel
#### Prerequisite

9
infra/config/generated/builders/ci/android-12-x64-fyi-rel/properties.json

@ -1,8 +1,9 @@
{
"$build/reclient": {
"instance": "rbe-chromium-trusted",
"jobs": 250,
"metrics_project": "chromium-reclient-metrics"
"$build/goma": {
"enable_ats": true,
"rpc_extra_params": "?prod",
"server_host": "goma.chromium.org",
"use_luci_auth": true
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],

19
infra/config/generated/builders/ci/android-12-x64-rel/properties.json Normal file

@ -0,0 +1,19 @@
{
"$build/reclient": {
"instance": "rbe-chromium-trusted",
"jobs": 500,
"metrics_project": "chromium-reclient-metrics"
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
"grouping_keys": [
"status",
"v.test_suite"
]
},
"builder_group": "chromium.android",
"recipe": "chromium",
"sheriff_rotations": [
"android"
]
}

7
infra/config/generated/builders/try/android-12-x64-fyi-rel/properties.json → infra/config/generated/builders/try/android-12-x64-rel-compilator/properties.json

@ -1,6 +1,7 @@
{
"$build/goma": {
"enable_ats": true,
"jobs": 300,
"rpc_extra_params": "?prod",
"server_host": "goma.chromium.org",
"use_luci_auth": true
@ -13,5 +14,9 @@
]
},
"builder_group": "tryserver.chromium.android",
"recipe": "chromium_trybot"
"orchestrator": {
"builder_group": "tryserver.chromium.android",
"builder_name": "android-12-x64-rel"
},
"recipe": "chromium/compilator"
}

15
infra/config/generated/builders/try/android-12-x64-rel/properties.json Normal file

@ -0,0 +1,15 @@
{
"$build/chromium_orchestrator": {
"compilator": "android-12-x64-rel-compilator",
"compilator_watcher_git_revision": "c49f1d02dec735eb0e8f03121d3fab2840c2c954"
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
"grouping_keys": [
"status",
"v.test_suite"
]
},
"builder_group": "tryserver.chromium.android",
"recipe": "chromium/orchestrator"
}

6
infra/config/generated/luci/commit-queue.cfg

@ -285,7 +285,11 @@ config_groups {
includable_only: true
}
builders {
name: "chromium/try/android-12-x64-fyi-rel"
name: "chromium/try/android-12-x64-rel"
includable_only: true
}
builders {
name: "chromium/try/android-12-x64-rel-compilator"
includable_only: true
}
builders {

187
infra/config/generated/luci/cr-buildbucket.cfg

@ -22426,7 +22426,89 @@ buckets {
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium"'
'}'
execution_timeout_secs: 21600
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
}
}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "blink_web_tests_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
}
}
}
history_options {
use_invocation_timestamp: true
}
}
}
builders {
name: "android-12-x64-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
cmd: "bootstrapper"
}
properties:
'{'
' "$bootstrap/exe": {'
' "exe": {'
' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
' "cipd_version": "refs/heads/main",'
' "cmd": ['
' "luciexe"'
' ]'
' }'
' },'
' "$bootstrap/properties": {'
' "properties_file": "infra/config/generated/builders/ci/android-12-x64-rel/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
' "host": "chromium.googlesource.com",'
' "project": "chromium/src"'
' }'
' }'
' },'
' "builder_group": "chromium.android",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium",'
' "sheriff_rotations": ['
' "android"'
' ]'
'}'
execution_timeout_secs: 14400
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
@ -47054,14 +47136,13 @@ buckets {
}
}
builders {
name: "android-12-x64-fyi-rel"
name: "android-12-x64-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "builder:android-12-x64-rel"
dimensions: "cores:4"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.try"
dimensions: "ssd:0"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@ -47079,7 +47160,7 @@ buckets {
' }'
' },'
' "$bootstrap/properties": {'
' "properties_file": "infra/config/generated/builders/try/android-12-x64-fyi-rel/properties.json",'
' "properties_file": "infra/config/generated/builders/try/android-12-x64-rel/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
@ -47090,7 +47171,98 @@ buckets {
' },'
' "builder_group": "tryserver.chromium.android",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium_trybot"'
' "recipe": "chromium/orchestrator"'
'}'
execution_timeout_secs: 14400
expiration_secs: 7200
grace_period {
seconds: 120
}
caches {
name: "win_toolchain"
path: "win_toolchain"
}
build_numbers: YES
service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {
value: 5
}
experiments {
key: "luci.recipes.use_python3"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "try_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
}
}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "blink_web_tests_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
}
}
}
history_options {
use_invocation_timestamp: true
}
}
description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium/builders/try/android-12-x64-rel-compilator\">android-12-x64-rel-compilator</a>."
}
builders {
name: "android-12-x64-rel-compilator"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:android-12-x64-rel-compilator"
dimensions: "cores:32"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.try"
dimensions: "ssd:1"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
cmd: "bootstrapper"
}
properties:
'{'
' "$bootstrap/exe": {'
' "exe": {'
' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
' "cipd_version": "refs/heads/main",'
' "cmd": ['
' "luciexe"'
' ]'
' }'
' },'
' "$bootstrap/properties": {'
' "properties_file": "infra/config/generated/builders/try/android-12-x64-rel-compilator/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
' "host": "chromium.googlesource.com",'
' "project": "chromium/src"'
' }'
' }'
' },'
' "builder_group": "tryserver.chromium.android",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium/compilator"'
'}'
execution_timeout_secs: 14400
expiration_secs: 7200
@ -47142,6 +47314,7 @@ buckets {
use_invocation_timestamp: true
}
}
description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium/builders/try/android-12-x64-rel\">android-12-x64-rel</a>."
}
builders {
name: "android-angle-chromium-try"

21
infra/config/generated/luci/luci-milo.cfg

@ -2408,6 +2408,12 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/android-11-x86-rel-compilator"
}
builders {
name: "buildbucket/luci.chromium.try/android-12-x64-rel"
}
builders {
name: "buildbucket/luci.chromium.try/android-12-x64-rel-compilator"
}
builders {
name: "buildbucket/luci.chromium.try/android-binary-size"
}
@ -3275,6 +3281,11 @@ consoles {
category: "builder_tester|arm64"
short_name: "p-cov"
}
builders {
name: "buildbucket/luci.chromium.ci/android-12-x64-rel"
category: "builder_tester|x64"
short_name: "12"
}
builders {
name: "buildbucket/luci.chromium.ci/android-11-x86-rel"
category: "builder_tester|x86"
@ -14124,7 +14135,10 @@ consoles {
name: "buildbucket/luci.chromium.try/android-12-x64-dbg"
}
builders {
name: "buildbucket/luci.chromium.try/android-12-x64-fyi-rel"
name: "buildbucket/luci.chromium.try/android-12-x64-rel"
}
builders {
name: "buildbucket/luci.chromium.try/android-12-x64-rel-compilator"
}
builders {
name: "buildbucket/luci.chromium.try/android-angle-chromium-try"
@ -15247,7 +15261,10 @@ consoles {
name: "buildbucket/luci.chromium.try/android-12-x64-dbg"
}
builders {
name: "buildbucket/luci.chromium.try/android-12-x64-fyi-rel"
name: "buildbucket/luci.chromium.try/android-12-x64-rel"
}
builders {
name: "buildbucket/luci.chromium.try/android-12-x64-rel-compilator"
}
builders {
name: "buildbucket/luci.chromium.try/android-asan"

6
infra/config/generated/luci/luci-scheduler.cfg

@ -4005,13 +4005,13 @@ job {
}
}
job {
id: "android-12-x64-fyi-rel"
id: "android-12-x64-rel"
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
builder: "android-12-x64-fyi-rel"
builder: "android-12-x64-rel"
}
}
job {
@ -7178,7 +7178,7 @@ trigger {
triggers: "Windows deterministic"
triggers: "android-10-arm64-rel"
triggers: "android-11-x86-rel"
triggers: "android-12-x64-fyi-rel"
triggers: "android-12-x64-rel"
triggers: "android-angle-arm64-builder"
triggers: "android-angle-chromium-arm64-builder"
triggers: "android-annotator-rel"

12
infra/config/subprojects/chromium/ci/chromium.android.fyi.star

@ -170,14 +170,10 @@ ci.builder(
category = "emulator|12|x64",
short_name = "rel",
),
# Bump to 6h for now since compile on x64 seems slower than x86. It could
# take 3h on Android-12 (For example ci.chromium.org/b/8841892751541698720)
# vs 1h on Android-11 (For example ci.chromium.org/b/8841899947736889024)
# TODO(crbug.com/1229245): Look into ways to improve the compile time.
execution_timeout = 6 * time.hour,
goma_backend = None,
reclient_jobs = rbe_jobs.DEFAULT,
reclient_instance = rbe_instance.DEFAULT,
# Set to an empty list to avoid chromium-gitiles-trigger triggering new
# builds. Also we don't set any `schedule` since this builder is for
# reference only and should not run any new builds.
triggered_by = [],
)
ci.builder(

12
infra/config/subprojects/chromium/ci/chromium.android.star

@ -577,6 +577,18 @@ ci.builder(
reclient_jobs = rbe_jobs.HIGH_JOBS_FOR_CI,
)
ci.builder(
name = "android-12-x64-rel",
console_view_entry = consoles.console_view_entry(
category = "builder_tester|x64",
short_name = "12",
),
execution_timeout = 4 * time.hour,
goma_backend = None,
reclient_instance = rbe_instance.DEFAULT,
reclient_jobs = rbe_jobs.HIGH_JOBS_FOR_CI,
)
ci.builder(
name = "android-weblayer-10-x86-rel-tests",
console_view_entry = consoles.console_view_entry(

15
infra/config/subprojects/chromium/try/tryserver.chromium.android.star

@ -55,8 +55,19 @@ try_.builder(
name = "android-12-x64-dbg",
)
try_.builder(
name = "android-12-x64-fyi-rel",
try_.orchestrator_builder(
name = "android-12-x64-rel",
compilator = "android-12-x64-rel-compilator",
# TODO(crbug.com/1225851): Enable it on branch after running on CQ
# branch_selector = branches.STANDARD_MILESTONE,
main_list_view = "try",
)
try_.compilator_builder(
name = "android-12-x64-rel-compilator",
# TODO(crbug.com/1225851): Enable it on branch after running on CQ
# branch_selector = branches.STANDARD_MILESTONE,
main_list_view = "try",
)
try_.builder(

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

File diff suppressed because it is too large Load Diff

4801
testing/buildbot/chromium.android.json

File diff suppressed because it is too large Load Diff

46
testing/buildbot/test_suite_exceptions.pyl

@ -147,7 +147,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.base_unittests.filter',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.base_unittests.filter',
'--gtest_filter=-ModuleCacheTest.CheckAgainstProcMaps', # crbug.com/1260521
@ -811,7 +811,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11_12.cc_unittests.filter',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
# https://crbug.com/1039860
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11_12.cc_unittests.filter',
@ -934,11 +934,15 @@
'ci_only': True,
'experiment_percentage': 100,
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.chrome_public_test_apk.filter',
'--timeout-scale=2.0',
],
# TODO(crbug.com/1225851): Remove experiment and ci_only
# once the test suite is stable.
'ci_only': True,
'experiment_percentage': 100,
},
'android-arm64-proguard-rel': {
'swarming': {
@ -1005,7 +1009,7 @@
],
},
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--avd-config=../../tools/android/avd/proto/generic_playstore_android31.textpb',
],
@ -1156,7 +1160,7 @@
'--gtest_filter=-FieldFormatterTest.DifferentLocales',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
# TODO(crbug.com/1192348): Fix the test failure
'--gtest_filter=-FieldFormatterTest.DifferentLocales',
@ -1299,7 +1303,7 @@
],
},
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.content_browsertests.filter',
],
@ -1435,7 +1439,7 @@
'--timeout-scale=2.0',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.content_shell_test_apk.filter',
],
@ -1507,7 +1511,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.crashpad_tests.filter',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.crashpad_tests.filter',
],
@ -1535,7 +1539,7 @@
},
'device_unittests': {
'modifications': {
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.device_unittests.filter',
],
@ -1751,7 +1755,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.gl_tests.filter',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.gl_tests.filter',
],
@ -1783,7 +1787,7 @@
'Linux MSan Tests',
],
'modifications': {
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.gl_unittests.filter',
],
@ -2138,7 +2142,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11_12.media_unittests.filter',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11_12.media_unittests.filter',
],
@ -2369,7 +2373,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.net_unittests.filter',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
# TODO(crbug.com/1191793): Fix the test failure
'--gtest_filter=-MimeUtilTest.ExtensionTest',
@ -2531,7 +2535,7 @@
},
'perfetto_unittests': {
'modifications': {
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
# TODO(crbug.com/1260440): Fix the failed test
'--gtest_filter=-ScopedDirTest.CloseOutOfScope',
@ -2727,7 +2731,7 @@
},
'sandbox_linux_unittests': {
'modifications': {
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_12.sandbox_linux_unittests.filter',
]
@ -2815,7 +2819,7 @@
'--gtest_filter=-PacLibraryTest.ActualPacMyIpAddress*'
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
# TODO(crbug.com/1264654): Fix the failed tests
'--gtest_filter=-PacLibraryTest.ActualPacMyIpAddress*'
@ -3547,7 +3551,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.blink_unittests.filter',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.blink_unittests.filter',
],
@ -3567,7 +3571,7 @@
'--gtest_filter=-DownloadBrowserTest.OverrideDownloadDirectory',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
# TODO(crbug.com/1191784): Fix the test failure
'--gtest_filter=-DownloadBrowserTest.OverrideDownloadDirectory',
@ -3634,7 +3638,7 @@
'--gtest_filter=-org.chromium.weblayer.test.MediaCaptureTest.*',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
# crbug.com/1275200
'--gtest_filter=-org.chromium.weblayer.test.BrowserControlsTest.testTopExpandedOnLoadWhenOnlyExpandAtTop',
@ -3657,7 +3661,7 @@
},
'webview_64_cts_tests': {
'remove_from': [
'android-12-x64-fyi-rel', # crbug.com/1260194
'android-12-x64-rel', # crbug.com/1260194
],
'modifications': {
'android-pie-arm64-rel': {
@ -3727,7 +3731,7 @@
'--gtest_filter=-org.chromium.net.NetworkChangeNotifierTest.testNetworkChangeNotifierJavaObservers',
],
},
'android-12-x64-fyi-rel': {
'android-12-x64-rel': {
'args': [
# crbug.com/1292197
'--gtest_filter=-org.chromium.android_webview.test.devui.HomeFragmentTest.testLongPressCopy*',

26
testing/buildbot/waterfalls.pyl

@ -701,6 +701,19 @@
'gtest_tests': 'android_11_emulator_gtests',
}
},
'android-12-x64-rel': {
'mixins': [
'12-x64-emulator',
'emulator-8-cores',
'has_native_resultdb_integration',
'linux-xenial-or-bionic',
'x86-64',
],
'os_type': 'android',
'test_suites': {
'gtest_tests': 'android_12_emulator_gtests',
}
},
'android-arm64-proguard-rel': {
'additional_compile_targets': [
'all',
@ -1163,19 +1176,6 @@
'gtest_tests': 'android_12_dbg_emulator_gtests',
}
},
'android-12-x64-fyi-rel': {
'mixins': [
'12-x64-emulator',
'emulator-8-cores',
'has_native_resultdb_integration',
'linux-xenial-or-bionic',
'x86-64',
],
'os_type': 'android',
'test_suites': {
'gtest_tests': 'android_12_emulator_gtests',
}
},
'android-annotator-rel': {
'test_suites': {
'scripts': 'test_traffic_annotation_auditor_script',

4
tools/mb/mb_config.pyl

@ -114,13 +114,13 @@
'android-weblayer-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_disable_proguard_webview_monochrome_reclient',
'android-10-arm64-rel': 'android_release_bot_minimal_symbols_arm64_fastbuild_webview_trichrome_reclient',
'android-11-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_trichrome_reclient',
'android-12-x64-rel': 'android_release_bot_minimal_symbols_x64_fastbuild_webview_trichrome_reclient',
},
'chromium.android.fyi': {
'Android ASAN (dbg) (reclient)': 'android_clang_asan_debug_bot_reclient',
'Android arm64 Builder (dbg) (reclient)': 'android_webview_google_debug_static_bot_arm64_reclient',
'Android WebView P FYI (rel)': 'android_release_bot_minimal_symbols_arm64_webview_monochrome_reclient',
'android-12-x64-fyi-rel': 'android_release_bot_minimal_symbols_x64_fastbuild_webview_trichrome_reclient',
'android-annotator-rel': 'android_release_bot_minimal_symbols_arm64_webview_google_reclient',
'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64_webview_monochrome_reclient',
'android-chrome-pie-x86-wpt-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_monochrome_reclient',
@ -845,8 +845,8 @@
'android-webview-pie-arm64-fyi-rel': 'android_release_trybot_arm64_webview_monochrome',
'android-10-arm64-rel': 'android_release_trybot_arm64_fastbuild_webview_trichrome',
'android-11-x86-rel': 'android_release_trybot_x86_fastbuild_webview_trichrome',
'android-12-x64-fyi-rel': 'android_release_trybot_x64_fastbuild_webview_trichrome',
'android-12-x64-dbg': 'android_debug_trybot_x64_webview_trichrome_webview_shell',
'android-12-x64-rel': 'android_release_trybot_x64_fastbuild_webview_trichrome',
'android-webview-12-x64-dbg': 'android_debug_trybot_x64_webview_trichrome_webview_shell',
'android-webview-marshmallow-arm64-dbg': 'android_release_trybot_arm64_webview_google',
'android-webview-nougat-arm64-dbg': 'android_release_trybot_arm64_webview_monochrome',

19
tools/mb/mb_config_expectations/chromium.android.fyi.json

@ -44,25 +44,6 @@
"use_remoteexec": true
}
},
"android-12-x64-fyi-rel": {
"gn_args": {
"dcheck_always_on": false,
"disable_android_lint": true,
"ffmpeg_branding": "Chrome",
"is_component_build": false,
"is_debug": false,
"proprietary_codecs": true,
"skip_secondary_abi_for_cq": true,
"strip_debug_info": true,
"symbol_level": 1,
"system_webview_package_name": "com.google.android.webview.debug",
"target_cpu": "x64",
"target_os": "android",
"use_errorprone_java_compiler": false,
"use_rbe": true,
"use_remoteexec": true
}
},
"android-annotator-rel": {
"gn_args": {
"dcheck_always_on": false,

19
tools/mb/mb_config_expectations/chromium.android.json

@ -141,6 +141,25 @@
"use_remoteexec": true
}
},
"android-12-x64-rel": {
"gn_args": {
"dcheck_always_on": false,
"disable_android_lint": true,
"ffmpeg_branding": "Chrome",
"is_component_build": false,
"is_debug": false,
"proprietary_codecs": true,
"skip_secondary_abi_for_cq": true,
"strip_debug_info": true,
"symbol_level": 1,
"system_webview_package_name": "com.google.android.webview.debug",
"target_cpu": "x64",
"target_os": "android",
"use_errorprone_java_compiler": false,
"use_rbe": true,
"use_remoteexec": true
}
},
"android-arm64-proguard-rel": {
"gn_args": {
"dcheck_always_on": false,

2
tools/mb/mb_config_expectations/tryserver.chromium.android.json

@ -49,7 +49,7 @@
"use_goma": true
}
},
"android-12-x64-fyi-rel": {
"android-12-x64-rel": {
"gn_args": {
"blink_enable_generated_code_formatting": false,
"dcheck_always_on": true,