diff --git a/infra/config/generated/builders/ci/mac-updater-builder-arm64-dbg/properties.json b/infra/config/generated/builders/ci/mac-updater-builder-arm64-dbg/properties.json
index f74d210132205..f88ebf10d7395 100644
--- a/infra/config/generated/builders/ci/mac-updater-builder-arm64-dbg/properties.json
+++ b/infra/config/generated/builders/ci/mac-updater-builder-arm64-dbg/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-dbg",
+ "builder": "mac11-arm64-updater-tester-dbg",
"project": "chromium"
},
"builder_spec": {
@@ -94,7 +94,7 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-dbg",
+ "builder": "mac11-arm64-updater-tester-dbg",
"project": "chromium"
},
{
diff --git a/infra/config/generated/builders/ci/mac-updater-builder-arm64-rel/properties.json b/infra/config/generated/builders/ci/mac-updater-builder-arm64-rel/properties.json
index b4f8d9f4baf35..913ccb0cca548 100644
--- a/infra/config/generated/builders/ci/mac-updater-builder-arm64-rel/properties.json
+++ b/infra/config/generated/builders/ci/mac-updater-builder-arm64-rel/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-rel",
+ "builder": "mac11-arm64-updater-tester-rel",
"project": "chromium"
},
"builder_spec": {
@@ -66,7 +66,7 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-rel",
+ "builder": "mac11-arm64-updater-tester-rel",
"project": "chromium"
}
]
diff --git a/infra/config/generated/builders/ci/mac-updater-builder-asan-dbg/properties.json b/infra/config/generated/builders/ci/mac-updater-builder-asan-dbg/properties.json
index 0523cb8bfcdf5..1146df49088d8 100644
--- a/infra/config/generated/builders/ci/mac-updater-builder-asan-dbg/properties.json
+++ b/infra/config/generated/builders/ci/mac-updater-builder-asan-dbg/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-updater-tester-asan-dbg",
+ "builder": "mac12-x64-updater-tester-asan-dbg",
"project": "chromium"
},
"builder_spec": {
@@ -66,7 +66,7 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
- "builder": "mac11.0-updater-tester-asan-dbg",
+ "builder": "mac12-x64-updater-tester-asan-dbg",
"project": "chromium"
}
]
diff --git a/infra/config/generated/builders/ci/mac-updater-builder-dbg/properties.json b/infra/config/generated/builders/ci/mac-updater-builder-dbg/properties.json
index d2dd8718d820e..a83d1f5e5c1f5 100644
--- a/infra/config/generated/builders/ci/mac-updater-builder-dbg/properties.json
+++ b/infra/config/generated/builders/ci/mac-updater-builder-dbg/properties.json
@@ -113,7 +113,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-updater-tester-dbg",
+ "builder": "mac11-x64-updater-tester-dbg",
"project": "chromium"
},
"builder_spec": {
@@ -165,7 +165,7 @@
},
{
"bucket": "ci",
- "builder": "mac11.0-updater-tester-dbg",
+ "builder": "mac11-x64-updater-tester-dbg",
"project": "chromium"
}
],
diff --git a/infra/config/generated/builders/ci/mac-updater-builder-rel/properties.json b/infra/config/generated/builders/ci/mac-updater-builder-rel/properties.json
index 3378aa1305d70..b2e6aec403713 100644
--- a/infra/config/generated/builders/ci/mac-updater-builder-rel/properties.json
+++ b/infra/config/generated/builders/ci/mac-updater-builder-rel/properties.json
@@ -113,7 +113,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-updater-tester-rel",
+ "builder": "mac11-x64-updater-tester-rel",
"project": "chromium"
},
"builder_spec": {
@@ -193,7 +193,7 @@
},
{
"bucket": "ci",
- "builder": "mac11.0-updater-tester-rel",
+ "builder": "mac11-x64-updater-tester-rel",
"project": "chromium"
},
{
diff --git a/infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-dbg/properties.json b/infra/config/generated/builders/ci/mac11-arm64-updater-tester-dbg/properties.json
similarity index 94%
rename from infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-dbg/properties.json
rename to infra/config/generated/builders/ci/mac11-arm64-updater-tester-dbg/properties.json
index 0296c3a1709d4..1c267c773eb2a 100644
--- a/infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-dbg/properties.json
+++ b/infra/config/generated/builders/ci/mac11-arm64-updater-tester-dbg/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-dbg",
+ "builder": "mac11-arm64-updater-tester-dbg",
"project": "chromium"
},
"builder_spec": {
@@ -59,7 +59,7 @@
"builder_ids": [
{
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-dbg",
+ "builder": "mac11-arm64-updater-tester-dbg",
"project": "chromium"
}
]
diff --git a/infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-rel/properties.json b/infra/config/generated/builders/ci/mac11-arm64-updater-tester-rel/properties.json
similarity index 94%
rename from infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-rel/properties.json
rename to infra/config/generated/builders/ci/mac11-arm64-updater-tester-rel/properties.json
index 9cf4f86da15c9..5ebbdcf0199b7 100644
--- a/infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-rel/properties.json
+++ b/infra/config/generated/builders/ci/mac11-arm64-updater-tester-rel/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-rel",
+ "builder": "mac11-arm64-updater-tester-rel",
"project": "chromium"
},
"builder_spec": {
@@ -59,7 +59,7 @@
"builder_ids": [
{
"bucket": "ci",
- "builder": "mac11.0-arm64-updater-tester-rel",
+ "builder": "mac11-arm64-updater-tester-rel",
"project": "chromium"
}
]
diff --git a/infra/config/generated/builders/ci/mac11.0-updater-tester-dbg/properties.json b/infra/config/generated/builders/ci/mac11-x64-updater-tester-dbg/properties.json
similarity index 94%
rename from infra/config/generated/builders/ci/mac11.0-updater-tester-dbg/properties.json
rename to infra/config/generated/builders/ci/mac11-x64-updater-tester-dbg/properties.json
index d45bb562c8dce..875e6bafd9af3 100644
--- a/infra/config/generated/builders/ci/mac11.0-updater-tester-dbg/properties.json
+++ b/infra/config/generated/builders/ci/mac11-x64-updater-tester-dbg/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-updater-tester-dbg",
+ "builder": "mac11-x64-updater-tester-dbg",
"project": "chromium"
},
"builder_spec": {
@@ -59,7 +59,7 @@
"builder_ids": [
{
"bucket": "ci",
- "builder": "mac11.0-updater-tester-dbg",
+ "builder": "mac11-x64-updater-tester-dbg",
"project": "chromium"
}
]
diff --git a/infra/config/generated/builders/ci/mac11.0-updater-tester-rel/properties.json b/infra/config/generated/builders/ci/mac11-x64-updater-tester-rel/properties.json
similarity index 94%
rename from infra/config/generated/builders/ci/mac11.0-updater-tester-rel/properties.json
rename to infra/config/generated/builders/ci/mac11-x64-updater-tester-rel/properties.json
index c9824818cbd88..1c997f4cd114b 100644
--- a/infra/config/generated/builders/ci/mac11.0-updater-tester-rel/properties.json
+++ b/infra/config/generated/builders/ci/mac11-x64-updater-tester-rel/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-updater-tester-rel",
+ "builder": "mac11-x64-updater-tester-rel",
"project": "chromium"
},
"builder_spec": {
@@ -59,7 +59,7 @@
"builder_ids": [
{
"bucket": "ci",
- "builder": "mac11.0-updater-tester-rel",
+ "builder": "mac11-x64-updater-tester-rel",
"project": "chromium"
}
]
diff --git a/infra/config/generated/builders/ci/mac11.0-updater-tester-asan-dbg/properties.json b/infra/config/generated/builders/ci/mac12-x64-updater-tester-asan-dbg/properties.json
similarity index 94%
rename from infra/config/generated/builders/ci/mac11.0-updater-tester-asan-dbg/properties.json
rename to infra/config/generated/builders/ci/mac12-x64-updater-tester-asan-dbg/properties.json
index 1c5c63482e322..23aa51cefc812 100644
--- a/infra/config/generated/builders/ci/mac11.0-updater-tester-asan-dbg/properties.json
+++ b/infra/config/generated/builders/ci/mac12-x64-updater-tester-asan-dbg/properties.json
@@ -29,7 +29,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "mac11.0-updater-tester-asan-dbg",
+ "builder": "mac12-x64-updater-tester-asan-dbg",
"project": "chromium"
},
"builder_spec": {
@@ -59,7 +59,7 @@
"builder_ids": [
{
"bucket": "ci",
- "builder": "mac11.0-updater-tester-asan-dbg",
+ "builder": "mac12-x64-updater-tester-asan-dbg",
"project": "chromium"
}
]
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 719c402a2e211..05d4a06a80105 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -44634,7 +44634,7 @@ buckets {
}
}
builders {
- name: "mac11.0-arm64-updater-tester-dbg"
+ name: "mac11-arm64-updater-tester-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
@@ -44660,7 +44660,7 @@ buckets {
' }'
' },'
' "$bootstrap/properties": {'
- ' "properties_file": "infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-dbg/properties.json",'
+ ' "properties_file": "infra/config/generated/builders/ci/mac11-arm64-updater-tester-dbg/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
@@ -44722,7 +44722,7 @@ buckets {
}
}
builders {
- name: "mac11.0-arm64-updater-tester-rel"
+ name: "mac11-arm64-updater-tester-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
@@ -44748,7 +44748,7 @@ buckets {
' }'
' },'
' "$bootstrap/properties": {'
- ' "properties_file": "infra/config/generated/builders/ci/mac11.0-arm64-updater-tester-rel/properties.json",'
+ ' "properties_file": "infra/config/generated/builders/ci/mac11-arm64-updater-tester-rel/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
@@ -44810,7 +44810,7 @@ buckets {
}
}
builders {
- name: "mac11.0-updater-tester-asan-dbg"
+ name: "mac11-x64-updater-tester-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
@@ -44836,7 +44836,7 @@ buckets {
' }'
' },'
' "$bootstrap/properties": {'
- ' "properties_file": "infra/config/generated/builders/ci/mac11.0-updater-tester-asan-dbg/properties.json",'
+ ' "properties_file": "infra/config/generated/builders/ci/mac11-x64-updater-tester-dbg/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
@@ -44898,7 +44898,7 @@ buckets {
}
}
builders {
- name: "mac11.0-updater-tester-dbg"
+ name: "mac11-x64-updater-tester-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
@@ -44924,95 +44924,7 @@ buckets {
' }'
' },'
' "$bootstrap/properties": {'
- ' "properties_file": "infra/config/generated/builders/ci/mac11.0-updater-tester-dbg/properties.json",'
- ' "top_level_project": {'
- ' "ref": "refs/heads/main",'
- ' "repo": {'
- ' "host": "chromium.googlesource.com",'
- ' "project": "chromium/src"'
- ' }'
- ' }'
- ' },'
- ' "builder_group": "chromium.updater",'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "chromium"'
- '}'
- execution_timeout_secs: 10800
- build_numbers: YES
- service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "chromium_swarming.expose_merge_script_failures"
- value: 100
- }
- experiments {
- key: "luci.buildbucket.omit_python2"
- value: 100
- }
- 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/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
- }
- }
- }
- history_options {
- use_invocation_timestamp: true
- }
- }
- }
- builders {
- name: "mac11.0-updater-tester-rel"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "builderless:1"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "free_space:standard"
- 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/mac11.0-updater-tester-rel/properties.json",'
+ ' "properties_file": "infra/config/generated/builders/ci/mac11-x64-updater-tester-rel/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
@@ -45251,6 +45163,94 @@ buckets {
}
}
}
+ builders {
+ name: "mac12-x64-updater-tester-asan-dbg"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
+ 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/mac12-x64-updater-tester-asan-dbg/properties.json",'
+ ' "top_level_project": {'
+ ' "ref": "refs/heads/main",'
+ ' "repo": {'
+ ' "host": "chromium.googlesource.com",'
+ ' "project": "chromium/src"'
+ ' }'
+ ' }'
+ ' },'
+ ' "builder_group": "chromium.updater",'
+ ' "led_builder_is_bootstrapped": true,'
+ ' "recipe": "chromium"'
+ '}'
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium_swarming.expose_merge_script_failures"
+ value: 100
+ }
+ experiments {
+ key: "luci.buildbucket.omit_python2"
+ value: 100
+ }
+ 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/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
+ }
+ }
+ }
+ history_options {
+ use_invocation_timestamp: true
+ }
+ }
+ }
builders {
name: "mac13-arm64-updater-tester-dbg"
swarming_host: "chromium-swarm.appspot.com"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index 690ae1dd73c81..4b5cba5efedee 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -14249,19 +14249,19 @@ consoles {
short_name: "10.15"
}
builders {
- name: "buildbucket/luci.chromium.ci/mac11.0-updater-tester-dbg"
+ name: "buildbucket/luci.chromium.ci/mac11-x64-updater-tester-dbg"
category: "debug|mac"
- short_name: "11.0"
+ short_name: "11"
}
builders {
- name: "buildbucket/luci.chromium.ci/mac11.0-arm64-updater-tester-dbg"
+ name: "buildbucket/luci.chromium.ci/mac11-arm64-updater-tester-dbg"
category: "debug|mac"
- short_name: "11.0 arm64"
+ short_name: "11 arm64"
}
builders {
- name: "buildbucket/luci.chromium.ci/mac11.0-updater-tester-asan-dbg"
+ name: "buildbucket/luci.chromium.ci/mac12-x64-updater-tester-asan-dbg"
category: "debug|mac"
- short_name: "11.0 asan"
+ short_name: "12 asan"
}
builders {
name: "buildbucket/luci.chromium.ci/mac13-arm64-updater-tester-dbg"
@@ -14354,14 +14354,14 @@ consoles {
short_name: "10.15"
}
builders {
- name: "buildbucket/luci.chromium.ci/mac11.0-updater-tester-rel"
+ name: "buildbucket/luci.chromium.ci/mac11-x64-updater-tester-rel"
category: "release|mac"
- short_name: "11.0"
+ short_name: "11"
}
builders {
- name: "buildbucket/luci.chromium.ci/mac11.0-arm64-updater-tester-rel"
+ name: "buildbucket/luci.chromium.ci/mac11-arm64-updater-tester-rel"
category: "release|mac"
- short_name: "11.0 arm64"
+ short_name: "11 arm64"
}
builders {
name: "buildbucket/luci.chromium.ci/mac13-x64-updater-tester-rel"
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index c21107030b046..b7ef01080fded 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -5471,48 +5471,39 @@ job {
}
}
job {
- id: "mac11.0-arm64-updater-tester-dbg"
+ id: "mac11-arm64-updater-tester-dbg"
realm: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
- builder: "mac11.0-arm64-updater-tester-dbg"
+ builder: "mac11-arm64-updater-tester-dbg"
}
}
job {
- id: "mac11.0-arm64-updater-tester-rel"
+ id: "mac11-arm64-updater-tester-rel"
realm: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
- builder: "mac11.0-arm64-updater-tester-rel"
+ builder: "mac11-arm64-updater-tester-rel"
}
}
job {
- id: "mac11.0-updater-tester-asan-dbg"
+ id: "mac11-x64-updater-tester-dbg"
realm: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
- builder: "mac11.0-updater-tester-asan-dbg"
+ builder: "mac11-x64-updater-tester-dbg"
}
}
job {
- id: "mac11.0-updater-tester-dbg"
+ id: "mac11-x64-updater-tester-rel"
realm: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
- builder: "mac11.0-updater-tester-dbg"
- }
-}
-job {
- id: "mac11.0-updater-tester-rel"
- realm: "ci"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "mac11.0-updater-tester-rel"
+ builder: "mac11-x64-updater-tester-rel"
}
}
job {
@@ -5534,6 +5525,15 @@ job {
builder: "mac12-wpt-content-shell-fyi-rel"
}
}
+job {
+ id: "mac12-x64-updater-tester-asan-dbg"
+ realm: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "mac12-x64-updater-tester-asan-dbg"
+ }
+}
job {
id: "mac13-arm64-updater-tester-dbg"
realm: "ci"
diff --git a/infra/config/generated/luci/realms.cfg b/infra/config/generated/luci/realms.cfg
index 833d393e17472..88c7c0896af33 100644
--- a/infra/config/generated/luci/realms.cfg
+++ b/infra/config/generated/luci/realms.cfg
@@ -168,12 +168,12 @@ realms {
values: "mac10.15-updater-tester-dbg"
values: "mac10.15-updater-tester-rel"
values: "mac11-arm64-rel-tests"
- values: "mac11.0-arm64-updater-tester-dbg"
- values: "mac11.0-arm64-updater-tester-rel"
- values: "mac11.0-updater-tester-asan-dbg"
- values: "mac11.0-updater-tester-dbg"
- values: "mac11.0-updater-tester-rel"
+ values: "mac11-arm64-updater-tester-dbg"
+ values: "mac11-arm64-updater-tester-rel"
+ values: "mac11-x64-updater-tester-dbg"
+ values: "mac11-x64-updater-tester-rel"
values: "mac12-arm64-rel-tests"
+ values: "mac12-x64-updater-tester-asan-dbg"
values: "mac13-arm64-updater-tester-dbg"
values: "mac13-x64-updater-tester-rel"
values: "win10-32-on-64-updater-tester-dbg"
diff --git a/infra/config/subprojects/chromium/ci/chromium.updater.star b/infra/config/subprojects/chromium/ci/chromium.updater.star
index bb06be943d718..e81df04cb787a 100644
--- a/infra/config/subprojects/chromium/ci/chromium.updater.star
+++ b/infra/config/subprojects/chromium/ci/chromium.updater.star
@@ -311,55 +311,7 @@ ci.thin_tester(
)
ci.thin_tester(
- name = "mac11.0-updater-tester-dbg",
- 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,
- ),
- ),
- triggered_by = ["mac-updater-builder-dbg"],
- console_view_entry = consoles.console_view_entry(
- category = "debug|mac",
- short_name = "11.0",
- ),
-)
-
-ci.thin_tester(
- name = "mac11.0-updater-tester-rel",
- 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.RELEASE,
- target_bits = 64,
- target_platform = builder_config.target_platform.MAC,
- ),
- ),
- triggered_by = ["mac-updater-builder-rel"],
- console_view_entry = consoles.console_view_entry(
- category = "release|mac",
- short_name = "11.0",
- ),
-)
-
-ci.thin_tester(
- name = "mac11.0-arm64-updater-tester-dbg",
+ name = "mac11-arm64-updater-tester-dbg",
builder_spec = builder_config.builder_spec(
execution_mode = builder_config.execution_mode.TEST,
gclient_config = builder_config.gclient_config(
@@ -378,12 +330,12 @@ ci.thin_tester(
triggered_by = ["mac-updater-builder-arm64-dbg"],
console_view_entry = consoles.console_view_entry(
category = "debug|mac",
- short_name = "11.0 arm64",
+ short_name = "11 arm64",
),
)
ci.thin_tester(
- name = "mac11.0-arm64-updater-tester-rel",
+ name = "mac11-arm64-updater-tester-rel",
builder_spec = builder_config.builder_spec(
execution_mode = builder_config.execution_mode.TEST,
gclient_config = builder_config.gclient_config(
@@ -402,13 +354,60 @@ ci.thin_tester(
triggered_by = ["mac-updater-builder-arm64-rel"],
console_view_entry = consoles.console_view_entry(
category = "release|mac",
- short_name = "11.0 arm64",
+ short_name = "11 arm64",
),
)
-# TODO(crbug.com/1381588): move to macOS 12 once crbug.com/1394839 is resolved.
ci.thin_tester(
- name = "mac11.0-updater-tester-asan-dbg",
+ name = "mac11-x64-updater-tester-dbg",
+ 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,
+ ),
+ ),
+ triggered_by = ["mac-updater-builder-dbg"],
+ console_view_entry = consoles.console_view_entry(
+ category = "debug|mac",
+ short_name = "11",
+ ),
+)
+
+ci.thin_tester(
+ name = "mac11-x64-updater-tester-rel",
+ 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.RELEASE,
+ target_bits = 64,
+ target_platform = builder_config.target_platform.MAC,
+ ),
+ ),
+ triggered_by = ["mac-updater-builder-rel"],
+ console_view_entry = consoles.console_view_entry(
+ category = "release|mac",
+ short_name = "11",
+ ),
+)
+
+ci.thin_tester(
+ name = "mac12-x64-updater-tester-asan-dbg",
builder_spec = builder_config.builder_spec(
execution_mode = builder_config.execution_mode.TEST,
gclient_config = builder_config.gclient_config(
@@ -427,7 +426,7 @@ ci.thin_tester(
triggered_by = ["mac-updater-builder-asan-dbg"],
console_view_entry = consoles.console_view_entry(
category = "debug|mac",
- short_name = "11.0 asan",
+ short_name = "12 asan",
),
)
diff --git a/testing/buildbot/chromium.updater.json b/testing/buildbot/chromium.updater.json
index d9afba94066de..b3d50737cc69e 100644
--- a/testing/buildbot/chromium.updater.json
+++ b/testing/buildbot/chromium.updater.json
@@ -272,7 +272,7 @@
}
]
},
- "mac11.0-arm64-updater-tester-dbg": {
+ "mac11-arm64-updater-tester-dbg": {
"gtest_tests": [
{
"merge": {
@@ -313,7 +313,7 @@
}
]
},
- "mac11.0-arm64-updater-tester-rel": {
+ "mac11-arm64-updater-tester-rel": {
"gtest_tests": [
{
"merge": {
@@ -354,7 +354,7 @@
}
]
},
- "mac11.0-updater-tester-asan-dbg": {
+ "mac11-x64-updater-tester-dbg": {
"gtest_tests": [
{
"merge": {
@@ -395,7 +395,7 @@
}
]
},
- "mac11.0-updater-tester-dbg": {
+ "mac11-x64-updater-tester-rel": {
"gtest_tests": [
{
"merge": {
@@ -436,7 +436,7 @@
}
]
},
- "mac11.0-updater-tester-rel": {
+ "mac12-x64-updater-tester-asan-dbg": {
"gtest_tests": [
{
"merge": {
@@ -448,32 +448,13 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-11"
+ "os": "Mac-12"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/"
- },
- {
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Mac-11",
- "pool": "chromium.updater.mac"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "updater_tests_system",
- "test_id_prefix": "ninja://chrome/updater:updater_tests_system/"
}
]
},
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 3d83462e549a2..3be1c75adee59 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -5750,7 +5750,7 @@
]
},
},
- 'mac11.0-arm64-updater-tester-dbg': {
+ 'mac11-arm64-updater-tester-dbg': {
'swarming': {
'dimension_sets': [
{
@@ -5763,7 +5763,7 @@
'gtest_tests': 'updater_gtests_mac',
},
},
- 'mac11.0-arm64-updater-tester-rel': {
+ 'mac11-arm64-updater-tester-rel': {
'swarming': {
'dimension_sets': [
{
@@ -5776,9 +5776,7 @@
'gtest_tests': 'updater_gtests_mac',
},
},
- # TODO(crbug.com/1381588): move to macOS 12 once crbug.com/1394839 is
- # resolved.
- 'mac11.0-updater-tester-asan-dbg': {
+ 'mac11-x64-updater-tester-dbg': {
'test_suites': {
'gtest_tests': 'updater_gtests_mac',
},
@@ -5791,7 +5789,7 @@
]
},
},
- 'mac11.0-updater-tester-dbg': {
+ 'mac11-x64-updater-tester-rel': {
'test_suites': {
'gtest_tests': 'updater_gtests_mac',
},
@@ -5804,15 +5802,19 @@
]
},
},
- 'mac11.0-updater-tester-rel': {
+
+ # TODO(crbug.com/1381588, crbug.com/1405483): replace
+ # `updater_gtests_mac_user` with `updater_gtests_mac` once
+ # crbug.com/1394839 is resolved.
+ 'mac12-x64-updater-tester-asan-dbg': {
'test_suites': {
- 'gtest_tests': 'updater_gtests_mac',
+ 'gtest_tests': 'updater_gtests_mac_user',
},
'swarming': {
'dimension_sets': [
{
'cpu': 'x86-64',
- 'os': 'Mac-11',
+ 'os': 'Mac-12',
}
]
},