Skip to content

Commit

Permalink
[M102][infra] Migrate configs for Mac Builder (dbg) src-side.
Browse files Browse the repository at this point in the history 
(cherry picked from commit 5870d1f)

Bug: 1317143
Change-Id: Id775cd41064f4ecd6f66e0844fdfa6b59fec20de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3621337
Auto-Submit: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#998596}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3622121
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#360}
Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
  • Loading branch information
@kleerwater
kleerwater authored and Chromium LUCI CQ committed May 2, 2022
1 parent d09a577 commit 6440ab3
Show file tree
Hide file tree
Showing 6 changed files with 315 additions and 0 deletions.
81 changes: 81 additions & 0 deletions infra/config/generated/builders/ci/Mac Builder (dbg)/properties.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,85 @@
{
"$build/chromium_tests_builder_config": {
"builder_config": {
"builder_db": {
"entries": [
{
"builder_id": {
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
},
"builder_spec": {
"build_gs_bucket": "chromium-mac-archive",
"builder_group": "chromium.mac",
"execution_mode": "COMPILE_AND_TEST",
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Debug",
"config": "chromium",
"target_bits": 64,
"target_platform": "mac"
},
"legacy_gclient_config": {
"config": "chromium"
}
}
},
{
"builder_id": {
"bucket": "ci",
"builder": "Mac11 Tests (dbg)",
"project": "chromium"
},
"builder_spec": {
"build_gs_bucket": "chromium-mac-archive",
"builder_group": "chromium.mac",
"execution_mode": "TEST",
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Debug",
"config": "chromium",
"target_bits": 64,
"target_platform": "mac"
},
"legacy_gclient_config": {
"config": "chromium"
},
"parent": {
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
}
}
}
]
},
"builder_ids": [
{
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
}
],
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
"builder": "Mac11 Tests (dbg)",
"project": "chromium"
}
],
"mirroring_builder_group_and_names": [
{
"builder": "mac_chromium_compile_dbg_ng",
"group": "tryserver.chromium.mac"
}
]
}
},
"$build/goma": {
"rpc_extra_params": "?prod",
"server_host": "goma.chromium.org",
Expand Down
74 changes: 74 additions & 0 deletions infra/config/generated/builders/ci/Mac11 Tests (dbg)/properties.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,78 @@
{
"$build/chromium_tests_builder_config": {
"builder_config": {
"builder_db": {
"entries": [
{
"builder_id": {
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
},
"builder_spec": {
"build_gs_bucket": "chromium-mac-archive",
"builder_group": "chromium.mac",
"execution_mode": "COMPILE_AND_TEST",
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Debug",
"config": "chromium",
"target_bits": 64,
"target_platform": "mac"
},
"legacy_gclient_config": {
"config": "chromium"
}
}
},
{
"builder_id": {
"bucket": "ci",
"builder": "Mac11 Tests (dbg)",
"project": "chromium"
},
"builder_spec": {
"build_gs_bucket": "chromium-mac-archive",
"builder_group": "chromium.mac",
"execution_mode": "TEST",
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Debug",
"config": "chromium",
"target_bits": 64,
"target_platform": "mac"
},
"legacy_gclient_config": {
"config": "chromium"
},
"parent": {
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
}
}
}
]
},
"builder_ids": [
{
"bucket": "ci",
"builder": "Mac11 Tests (dbg)",
"project": "chromium"
}
],
"mirroring_builder_group_and_names": [
{
"builder": "mac_chromium_compile_dbg_ng",
"group": "tryserver.chromium.mac"
}
]
}
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
"grouping_keys": [
Expand Down
76 changes: 76 additions & 0 deletions infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,80 @@
{
"$build/chromium_tests_builder_config": {
"builder_config": {
"builder_db": {
"entries": [
{
"builder_id": {
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
},
"builder_spec": {
"build_gs_bucket": "chromium-mac-archive",
"builder_group": "chromium.mac",
"execution_mode": "COMPILE_AND_TEST",
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Debug",
"config": "chromium",
"target_bits": 64,
"target_platform": "mac"
},
"legacy_gclient_config": {
"config": "chromium"
}
}
},
{
"builder_id": {
"bucket": "ci",
"builder": "Mac11 Tests (dbg)",
"project": "chromium"
},
"builder_spec": {
"build_gs_bucket": "chromium-mac-archive",
"builder_group": "chromium.mac",
"execution_mode": "TEST",
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Debug",
"config": "chromium",
"target_bits": 64,
"target_platform": "mac"
},
"legacy_gclient_config": {
"config": "chromium"
},
"parent": {
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
}
}
}
]
},
"builder_ids": [
{
"bucket": "ci",
"builder": "Mac Builder (dbg)",
"project": "chromium"
}
],
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
"builder": "Mac11 Tests (dbg)",
"project": "chromium"
}
],
"is_compile_only": true
}
},
"$build/goma": {
"jobs": 150,
"rpc_extra_params": "?prod",
Expand Down
31 changes: 31 additions & 0 deletions infra/config/subprojects/chromium/ci/chromium.mac.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,21 @@ ci.builder(
ci.builder(
name = "Mac Builder (dbg)",
branch_selector = branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
builder_spec = builder_config.builder_spec(
gclient_config = builder_config.gclient_config(
config = "chromium",
),
chromium_config = builder_config.chromium_config(
config = "chromium",
apply_configs = [
"mb",
],
build_config = builder_config.build_config.DEBUG,
target_bits = 64,
target_platform = builder_config.target_platform.MAC,
),
build_gs_bucket = "chromium-mac-archive",
),
console_view_entry = consoles.console_view_entry(
category = "debug",
short_name = "bld",
Expand Down Expand Up @@ -329,6 +344,22 @@ ci.thin_tester(
ci.thin_tester(
name = "Mac11 Tests (dbg)",
branch_selector = branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
builder_spec = builder_config.builder_spec(
execution_mode = builder_config.execution_mode.TEST,
gclient_config = builder_config.gclient_config(
config = "chromium",
),
chromium_config = builder_config.chromium_config(
config = "chromium",
apply_configs = [
"mb",
],
build_config = builder_config.build_config.DEBUG,
target_bits = 64,
target_platform = builder_config.target_platform.MAC,
),
build_gs_bucket = "chromium-mac-archive",
),
console_view_entry = consoles.console_view_entry(
category = "debug",
short_name = "11",
Expand Down
11 changes: 11 additions & 0 deletions infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ try_.builder(
try_.builder(
name = "mac_chromium_compile_dbg_ng",
branch_selector = branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
mirrors = [
"ci/Mac Builder (dbg)",
],
try_settings = builder_config.try_settings(
include_all_triggered_testers = True,
is_compile_only = True,
),
goma_jobs = goma.jobs.J150,
os = os.MAC_DEFAULT,
main_list_view = "try",
Expand All @@ -213,6 +220,10 @@ try_.builder(

try_.builder(
name = "mac_chromium_dbg_ng",
mirrors = [
"ci/Mac Builder (dbg)",
"ci/Mac11 Tests (dbg)",
],
)

try_.builder(
Expand Down
42 changes: 42 additions & 0 deletions infra/config/subprojects/goma/goma.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,41 @@ fyi_goma_rbe_canary_builder(

fyi_goma_rbe_canary_builder(
name = "Mac Builder (dbg) Goma RBE Canary (clobber)",
builder_spec = builder_config.copy_from(
"ci/Mac Builder (dbg)",
lambda spec: structs.evolve(
spec,
chromium_config = structs.extend(
spec.chromium_config,
apply_configs = [
"goma_canary",
"clobber",
],
),
build_gs_bucket = "chromium-fyi-archive",
),
),
cores = 4,
goma_jobs = goma.jobs.J80,
os = os.MAC_DEFAULT,
)

fyi_goma_rbe_canary_builder(
name = "Mac M1 Builder (dbg) Goma RBE Canary (clobber)",
builder_spec = builder_config.copy_from(
"ci/Mac Builder (dbg)",
lambda spec: structs.evolve(
spec,
chromium_config = structs.extend(
spec.chromium_config,
apply_configs = [
"goma_canary",
"clobber",
],
),
build_gs_bucket = "chromium-fyi-archive",
),
),
cores = None,
goma_jobs = goma.jobs.J80,
os = os.MAC_11,
Expand Down Expand Up @@ -208,6 +236,20 @@ fyi_goma_rbe_latest_client_builder(

fyi_goma_rbe_latest_client_builder(
name = "Mac Builder (dbg) Goma RBE Latest Client (clobber)",
builder_spec = builder_config.copy_from(
"ci/Mac Builder (dbg)",
lambda spec: structs.evolve(
spec,
chromium_config = structs.extend(
spec.chromium_config,
apply_configs = [
"goma_latest_client",
"clobber",
],
),
build_gs_bucket = "chromium-fyi-archive",
),
),
cores = 4,
goma_jobs = goma.jobs.J80,
os = os.MAC_DEFAULT,
Expand Down

0 comments on commit 6440ab3

Please sign in to comment.