0

Replace mac14-arm64-rel with mac15-arm64-rel on experimental CQ

Bug: 415099984
Change-Id: I3c59ad2aa130132761279e57d422b5e4206ba551
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6542766
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Commit-Queue: Rahul Kumar Adudodla (xWF) <adudodla@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1460762}
This commit is contained in:
Rahul Kumar Adudodla
2025-05-15 08:59:25 -07:00
committed by Chromium LUCI CQ
parent 5b4027db73
commit 79413617b3
8 changed files with 15 additions and 195 deletions
infra/config
generated
subprojects

@ -23,7 +23,6 @@ ci/mac15-x64-rel-tests
try/ios-vm
try/mac-vm
try/mac14-arm64-rel
try/mac14-arm64-rel-compilator
try/mac14-tests
try/mac15-arm64-rel
try/mac15-arm64-rel-compilator

@ -1,4 +0,0 @@
{
"builder_group": "tryserver.chromium.mac",
"recipe": "chromium/compilator"
}

@ -1,8 +1,4 @@
{
"$build/chromium_orchestrator": {
"compilator": "mac14-arm64-rel-compilator",
"compilator_watcher_git_revision": "27c191f304c8d7329a393d8a69020fc14032c3c3"
},
"$build/chromium_tests_builder_config": {
"builder_config": {
"additional_exclusions": [
@ -85,10 +81,6 @@
"targets_spec_directory": "src/infra/config/generated/builders/try/mac14-arm64-rel/targets"
}
},
"$build/flakiness": {
"check_for_flakiness": true,
"check_for_flakiness_with_resultdb": true
},
"$build/siso": {
"configs": [
"builder"
@ -98,8 +90,7 @@
"enable_cloud_trace": true,
"experiments": [],
"metrics_project": "chromium-reclient-metrics",
"project": "rbe-chromium-untrusted",
"remote_jobs": -1
"project": "rbe-chromium-untrusted"
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
@ -109,6 +100,5 @@
]
},
"builder_group": "tryserver.chromium.mac",
"cq": "required",
"recipe": "chromium/orchestrator"
"recipe": "chromium_trybot"
}

@ -855,11 +855,8 @@ as required builders.
* [linux-rel-test-selection](https://ci.chromium.org/p/chromium/builders/try/linux-rel-test-selection) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""linux-rel-test-selection""))
* Experiment percentage: 10.0
* [mac14-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/mac14-arm64-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""mac14-arm64-rel""))
* Experiment percentage: 75.0
* [mac15-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/mac15-arm64-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""mac15-arm64-rel""))
* Experiment percentage: 1.0
* Experiment percentage: 100.0
* [tricium-clang-tidy](https://ci.chromium.org/p/chromium/builders/try/tricium-clang-tidy) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""tricium-clang-tidy""))
* Experiment percentage: 100.0

@ -6560,33 +6560,6 @@ config_groups {
}
builders {
name: "chromium/try/mac14-arm64-rel"
disable_reuse_footers: "Include-Ci-Only-Tests"
experiment_percentage: 75
location_filters {
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
path_regexp: "infra/config/.+"
exclude: true
}
location_filters {
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
path_regexp: "docs/.+"
exclude: true
}
location_filters {
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
path_regexp: "infra/config/generated/builders/try/mac14-arm64-rel/.+"
}
mode_allowlist: "DRY_RUN"
mode_allowlist: "FULL_RUN"
}
builders {
name: "chromium/try/mac14-arm64-rel-compilator"
includable_only: true
disable_reuse_footers: "Include-Ci-Only-Tests"
}
@ -6608,7 +6581,7 @@ config_groups {
builders {
name: "chromium/try/mac15-arm64-rel"
disable_reuse_footers: "Include-Ci-Only-Tests"
experiment_percentage: 1
experiment_percentage: 100
location_filters {
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"

@ -124898,11 +124898,12 @@ buckets {
builders {
name: "mac14-arm64-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:mac14-arm64-rel"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-22.04"
dimensions: "builderless:1"
dimensions: "cpu:arm64"
dimensions: "free_space:standard"
dimensions: "os:Mac-15"
dimensions: "pool:luci.chromium.try"
dimensions: "ssd:1"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@ -124930,129 +124931,14 @@ buckets {
' }'
' },'
' "builder_group": "tryserver.chromium.mac",'
' "cq": "required",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium/orchestrator"'
' "recipe": "chromium_trybot"'
'}'
execution_timeout_secs: 14400
expiration_secs: 7200
grace_period {
seconds: 120
}
caches {
name: "unused_builder_cache"
path: "builder"
}
build_numbers: YES
service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
}
experiments {
key: "luci.buildbucket.canary_software"
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|content)/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/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
}
}
}
history_options {
use_invocation_timestamp: true
}
}
description_html: "Compiles and runs MacOS 14 tests on ARM machines<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/mac-arm64-rel\">mac-arm64-rel</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/mac14-arm64-rel-tests\">mac14-arm64-rel-tests</a></li></ul><br/>Builder owner: <a href=mailto:bling-engprod@google.com>bling-engprod@google.com</a><br/>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/mac14-arm64-rel-compilator\">mac14-arm64-rel-compilator</a>."
contact_team_email: "bling-engprod@google.com"
custom_metric_definitions {
name: "/chrome/infra/browser/builds/cached_count"
predicates: "has(build.output.properties.is_cached)"
predicates: "string(build.output.properties.is_cached) == \"true\""
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
predicates: "has(build.output.properties.ran_tests_retry_shard)"
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
predicates: "has(build.output.properties.ran_tests_without_patch)"
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/uncached_count"
predicates: "has(build.output.properties.is_cached)"
predicates: "string(build.output.properties.is_cached) == \"false\""
}
}
builders {
name: "mac14-arm64-rel-compilator"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:mac14-arm64-rel-compilator"
dimensions: "cpu:arm64"
dimensions: "os:Mac-15"
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/mac14-arm64-rel-compilator/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
' "host": "chromium.googlesource.com",'
' "project": "chromium/src"'
' }'
' }'
' },'
' "builder_group": "tryserver.chromium.mac",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium/compilator"'
'}'
execution_timeout_secs: 14400
expiration_secs: 7200
grace_period {
seconds: 240
}
build_numbers: YES
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
@ -125099,7 +124985,7 @@ buckets {
use_invocation_timestamp: true
}
}
description_html: "compilator for mac14-arm64-rel<br/>Builder owner: <a href=mailto:bling-engprod@google.com>bling-engprod@google.com</a><br/>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/mac14-arm64-rel\">mac14-arm64-rel</a>."
description_html: "Compiles and runs MacOS 14 tests on ARM machines<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/mac-arm64-rel\">mac-arm64-rel</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/mac14-arm64-rel-tests\">mac14-arm64-rel-tests</a></li></ul><br/>Builder owner: <a href=mailto:bling-engprod@google.com>bling-engprod@google.com</a>"
contact_team_email: "bling-engprod@google.com"
custom_metric_definitions {
name: "/chrome/infra/browser/builds/cached_count"

@ -3381,9 +3381,6 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/mac14-arm64-rel"
}
builders {
name: "buildbucket/luci.chromium.try/mac14-arm64-rel-compilator"
}
builders {
name: "buildbucket/luci.chromium.try/mac15-arm64-rel"
}
@ -27671,9 +27668,6 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/mac14-arm64-rel"
}
builders {
name: "buildbucket/luci.chromium.try/mac14-arm64-rel-compilator"
}
builders {
name: "buildbucket/luci.chromium.try/mac14-blink-rel"
}
@ -29200,9 +29194,6 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/mac14-arm64-rel"
}
builders {
name: "buildbucket/luci.chromium.try/mac14-arm64-rel-compilator"
}
builders {
name: "buildbucket/luci.chromium.try/mac14-tests"
}

@ -311,7 +311,7 @@ try_.builder(
main_list_view = "try",
)
try_.orchestrator_builder(
try_.builder(
name = "mac14-arm64-rel",
branch_selector = branches.selector.MAC_BRANCHES,
description_html = "Compiles and runs MacOS 14 tests on ARM machines",
@ -329,22 +329,10 @@ try_.orchestrator_builder(
"mac",
],
),
compilator = "mac14-arm64-rel-compilator",
contact_team_email = "bling-engprod@google.com",
main_list_view = "try",
tryjob = try_.job(
experiment_percentage = 75,
),
)
try_.compilator_builder(
name = "mac14-arm64-rel-compilator",
branch_selector = branches.selector.MAC_BRANCHES,
description_html = "compilator for mac14-arm64-rel",
builderless = True,
cores = None,
cpu = cpu.ARM64,
contact_team_email = "bling-engprod@google.com",
# TODO (crbug.com/1245171): Revert when root issue is fixed
grace_period = 4 * time.minute,
main_list_view = "try",
)
@ -373,7 +361,7 @@ try_.orchestrator_builder(
# TODO (crbug.com/415099984): change to 100,
# then move out of experimental CQ after,
# mac15-arm64-rel replaces mac14-arm64-rel on CQ.
experiment_percentage = 1,
experiment_percentage = 100,
),
)