From 5e676bfdc8c9329ee5f749098383586c7ad87bde Mon Sep 17 00:00:00 2001 From: Gregory Guterman Date: Wed, 22 Jun 2022 00:21:37 +0000 Subject: [PATCH 30/59] [infra] Migrate configs for android_cronet src-side. (cherry picked from commit cd384a5c8ef5736f97ae34982f8d3e38a1a64e8f) Bug: 1317104 Change-Id: I17c2d9d869ea57125d92d4278a820a6ff87b05ff Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3656312 Commit-Queue: Garrett Beaty Auto-Submit: Gregory Guterman Reviewed-by: Garrett Beaty Cr-Original-Commit-Position: refs/heads/main@{#1011734} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3717523 Cr-Commit-Position: refs/branch-heads/5005@{#1189} Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} --- .../ci/android-cronet-arm-rel/properties.json | 53 +++++++++++++++++++ .../try/android_cronet/properties.json | 48 +++++++++++++++++ .../chromium/ci/chromium.android.star | 23 ++++++++ .../try/tryserver.chromium.android.star | 6 +++ 4 files changed, 130 insertions(+) diff --git a/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json b/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json index d68921bae929..4c1bee9eeb18 100644 --- a/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json +++ b/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json @@ -1,4 +1,57 @@ { + "$build/chromium_tests_builder_config": { + "builder_config": { + "builder_db": { + "entries": [ + { + "builder_id": { + "bucket": "ci", + "builder": "android-cronet-arm-rel", + "project": "chromium" + }, + "builder_spec": { + "build_gs_bucket": "chromium-android-archive", + "builder_group": "chromium.android", + "execution_mode": "COMPILE_AND_TEST", + "legacy_android_config": { + "config": "main_builder" + }, + "legacy_chromium_config": { + "apply_configs": [ + "cronet_builder", + "mb" + ], + "build_config": "Release", + "config": "android", + "target_bits": 32, + "target_platform": "android" + }, + "legacy_gclient_config": { + "apply_configs": [ + "android", + "enable_reclient" + ], + "config": "chromium" + } + } + } + ] + }, + "builder_ids": [ + { + "bucket": "ci", + "builder": "android-cronet-arm-rel", + "project": "chromium" + } + ], + "mirroring_builder_group_and_names": [ + { + "builder": "android_cronet", + "group": "tryserver.chromium.android" + } + ] + } + }, "$build/reclient": { "instance": "rbe-chromium-trusted", "jobs": 500, diff --git a/infra/config/generated/builders/try/android_cronet/properties.json b/infra/config/generated/builders/try/android_cronet/properties.json index d90599ce7370..160fc425c26a 100644 --- a/infra/config/generated/builders/try/android_cronet/properties.json +++ b/infra/config/generated/builders/try/android_cronet/properties.json @@ -1,4 +1,52 @@ { + "$build/chromium_tests_builder_config": { + "builder_config": { + "builder_db": { + "entries": [ + { + "builder_id": { + "bucket": "ci", + "builder": "android-cronet-arm-rel", + "project": "chromium" + }, + "builder_spec": { + "build_gs_bucket": "chromium-android-archive", + "builder_group": "chromium.android", + "execution_mode": "COMPILE_AND_TEST", + "legacy_android_config": { + "config": "main_builder" + }, + "legacy_chromium_config": { + "apply_configs": [ + "cronet_builder", + "mb" + ], + "build_config": "Release", + "config": "android", + "target_bits": 32, + "target_platform": "android" + }, + "legacy_gclient_config": { + "apply_configs": [ + "android", + "enable_reclient" + ], + "config": "chromium" + } + } + } + ] + }, + "builder_ids": [ + { + "bucket": "ci", + "builder": "android-cronet-arm-rel", + "project": "chromium" + } + ], + "is_compile_only": true + } + }, "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", diff --git a/infra/config/subprojects/chromium/ci/chromium.android.star b/infra/config/subprojects/chromium/ci/chromium.android.star index a2e046777d7a..8905963349cd 100644 --- a/infra/config/subprojects/chromium/ci/chromium.android.star +++ b/infra/config/subprojects/chromium/ci/chromium.android.star @@ -632,6 +632,29 @@ ci.builder( ci.builder( name = "android-cronet-arm-rel", + builder_spec = builder_config.builder_spec( + gclient_config = builder_config.gclient_config( + config = "chromium", + apply_configs = [ + "android", + "enable_reclient", + ], + ), + chromium_config = builder_config.chromium_config( + config = "android", + apply_configs = [ + "cronet_builder", + "mb", + ], + build_config = builder_config.build_config.RELEASE, + target_bits = 32, + target_platform = builder_config.target_platform.ANDROID, + ), + android_config = builder_config.android_config( + config = "main_builder", + ), + build_gs_bucket = "chromium-android-archive", + ), branch_selector = branches.STANDARD_MILESTONE, console_view_entry = consoles.console_view_entry( category = "cronet|arm", diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star index 94cd15630829..994a280cb969 100644 --- a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star +++ b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star @@ -555,6 +555,12 @@ try_.builder( try_.builder( name = "android_cronet", + mirrors = [ + "ci/android-cronet-arm-rel", + ], + try_settings = builder_config.try_settings( + is_compile_only = True, + ), branch_selector = branches.STANDARD_MILESTONE, builderless = not settings.is_main, main_list_view = "try", -- 2.37.0