Skip to content

GitLab

T
tangled
Commit ce0f2cd4 authored by Gregory Guterman's avatar Gregory Guterman Committed by Commit Bot
Browse files
Options

Revert "Remove Mac 10.10 builders" 

This reverts commit f983ad81.

Reason for revert: Broke CI builder mac-updater-builder-rel https://ci.chromium.org/p/chromium/builders/ci/mac-updater-builder-rel/1198

Original change's description:
> Remove Mac 10.10 builders
>
> Bug: 1149560
> Change-Id: Ib9798ca9e092edfba05dff7fa7f641e156182cb2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2548680
> Auto-Submit: Stephen Martinis <martiniss@chromium.org>
> Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
> Commit-Queue: Stephen Martinis <martiniss@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#829364}

TBR=martiniss@chromium.org,gbeaty@chromium.org

Change-Id: Ie979df929b64896c01ca4858909b8cbe902e7a25
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1149560
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2551638
Auto-Submit: Gregory Guterman <guterman@google.com>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829417}
parent 05a50215
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2060 additions and 0 deletions
infra/config/generated/commit-queue.cfg
View file @ ce0f2cd4
......@@ -1359,6 +1359,10 @@ config_groups {
name: "chromium/try/mac11.0-blink-rel"
includable_only: true
}
builders {
name: "chromium/try/mac_chromium_10.10"
includable_only: true
}
builders {
name: "chromium/try/mac_chromium_10.12_rel_ng"
includable_only: true
......
infra/config/generated/cr-buildbucket.cfg
View file @ ce0f2cd4
......@@ -8864,6 +8864,53 @@ buckets {
}
}
}
builders {
name: "Mac10.10 Tests"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.resultdb.result_sink"
value: 80
}
experiments {
key: "luci.use_realms"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
}
}
}
}
}
builders {
name: "Mac10.11 Tests"
swarming_host: "chromium-swarm.appspot.com"
......@@ -19488,6 +19535,53 @@ buckets {
}
}
}
builders {
name: "mac10.10-updater-tester-rel"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.resultdb.result_sink"
value: 80
}
experiments {
key: "luci.use_realms"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
}
}
}
}
}
builders {
name: "mac10.11-updater-tester-rel"
swarming_host: "chromium-swarm.appspot.com"
......@@ -36846,6 +36940,60 @@ buckets {
}
}
}
builders {
name: "mac_chromium_10.10"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cpu:x86-64"
dimensions: "os:Mac"
dimensions: "pool:luci.chromium.try"
dimensions: "ssd:1"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\"}"
execution_timeout_secs: 14400
expiration_secs: 7200
caches {
name: "win_toolchain"
path: "win_toolchain"
}
build_numbers: YES
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {
value: 5
}
experiments {
key: "chromium.resultdb.result_sink"
value: 80
}
experiments {
key: "luci.use_realms"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "try_test_results"
test_results {}
}
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
}
}
}
}
}
builders {
name: "mac_chromium_10.12_rel_ng"
swarming_host: "chromium-swarm.appspot.com"
infra/config/generated/luci-milo.cfg
View file @ ce0f2cd4
......@@ -145,6 +145,11 @@ consoles {
category: "chromium.mac|release"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
category: "chromium.mac|release"
short_name: "10"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
category: "chromium.mac|release"
......@@ -819,6 +824,11 @@ consoles {
category: "chromium.mac|release"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
category: "chromium.mac|release"
short_name: "10"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
category: "chromium.mac|release"
......@@ -7973,6 +7983,11 @@ consoles {
category: "release"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
category: "release"
short_name: "10"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
category: "release"
......@@ -9368,6 +9383,11 @@ consoles {
category: "debug|win"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/mac10.10-updater-tester-rel"
category: "release|mac"
short_name: "10.10"
}
builders {
name: "buildbucket/luci.chromium.ci/mac10.11-updater-tester-rel"
category: "release|mac"
......@@ -12195,6 +12215,9 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/mac11.0-blink-rel"
}
builders {
name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
}
builders {
name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
}
......@@ -13075,6 +13098,9 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/mac-rel"
}
builders {
name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
}
builders {
name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
}
......
infra/config/generated/luci-notify.cfg
View file @ ce0f2cd4
......@@ -1507,6 +1507,24 @@ notifiers {
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
}
}
notifiers {
notifications {
on_occurrence: FAILURE
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
email {
rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
}
template: "tree_closure_email_template"
}
builders {
bucket: "ci"
name: "Mac10.10 Tests"
}
tree_closers {
tree_status_host: "chromium-status.appspot.com"
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
}
}
notifiers {
notifications {
on_occurrence: FAILURE
......
infra/config/generated/luci-scheduler.cfg
View file @ ce0f2cd4
......@@ -2602,6 +2602,20 @@ job {
builder: "Mac deterministic (dbg)"
}
}
job {
id: "Mac10.10 Tests"
realm: "ci"
acls {
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "Mac10.10 Tests"
}
}
job {
id: "Mac10.11 Tests"
realm: "ci"
......@@ -5850,6 +5864,20 @@ job {
builder: "mac-upload-perfetto"
}
}
job {
id: "mac10.10-updater-tester-rel"
realm: "ci"
acls {
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "mac10.10-updater-tester-rel"
}
}
job {
id: "mac10.11-updater-tester-rel"
realm: "ci"
......
infra/config/subprojects/chromium/ci.star
View file @ ce0f2cd4
......@@ -2655,6 +2655,15 @@ ci.updater_builder(
cores = None,
)
ci.updater_builder(
name = "mac10.10-updater-tester-rel",
console_view_entry = ci.console_view_entry(
category = "release|mac",
short_name = "10.10",
),
triggered_by = ["mac-updater-builder-rel"],
)
ci.updater_builder(
name = "mac10.11-updater-tester-rel",
console_view_entry = ci.console_view_entry(
......@@ -4463,6 +4472,19 @@ ci.thin_tester(
triggered_by = [builder_name("mac-arm64-rel")],
)
ci.thin_tester(
name = "Mac10.10 Tests",
branch_selector = branches.STANDARD_MILESTONE,
builder_group = "chromium.mac",
console_view_entry = ci.console_view_entry(
category = "release",
short_name = "10",
),
cq_mirrors_console_view = "mirrors",
main_console_view = "main",
triggered_by = [builder_name("Mac Builder")],
)
ci.thin_tester(
name = "Mac10.11 Tests",
branch_selector = branches.STANDARD_MILESTONE,
......
infra/config/subprojects/chromium/try.star
View file @ ce0f2cd4
......@@ -1245,6 +1245,10 @@ try_.chromium_mac_builder(
# NOTE: the following trybots aren't sensitive to Mac version on which
# they are built, hence no additional dimension is specified.
# The 10.xx version translates to which bots will run isolated tests.
try_.chromium_mac_builder(
name = "mac_chromium_10.10",
)
try_.chromium_mac_builder(
name = "mac_chromium_10.12_rel_ng",
)
......
testing/buildbot/chromium.mac.json
View file @ ce0f2cd4
This diff is collapsed.
testing/buildbot/chromium.updater.json
View file @ ce0f2cd4
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"mac10.10-updater-tester-rel": {
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac-10.10"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/"
}
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac-10.10"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
]
},
"mac10.11-updater-tester-rel": {
"gtest_tests": [
{
......
testing/buildbot/mixins.pyl
View file @ ce0f2cd4
......@@ -512,6 +512,13 @@
'mac-release/sizes',
],
},
'mac_10.10': {
'swarming': {
'dimensions': {
'os': 'Mac-10.10',
},
},
},
'mac_10.11': {
'swarming': {
'dimensions': {
......
testing/buildbot/test_suite_exceptions.pyl
View file @ ce0f2cd4
......@@ -189,6 +189,7 @@
},
'blink_web_tests': {
'remove_from': [
'Mac10.10 Tests',
'Mac10.11 Tests',
'Win 7 Tests x64 (1)', # 64-bit win is unsupported by the layout tests.
'Win10 Tests x64 (dbg)',
......@@ -215,6 +216,18 @@
'shards': 20,
},
},
'Mac10.10 Tests': {
# TODO(kbr): this is essentially redundant.
'swarming': {
'dimension_sets': [
{
'gpu': 'none',
'os': 'Mac-10.10.5',
},
],
'shards': 25,
},
},
'Mac10.11 Tests': {
# TODO(kbr): this is essentially redundant.
'swarming': {
......@@ -479,6 +492,7 @@
'CrWinAsan(dll)', # https://crbug.com/935598
'linux-win_cross-rel',
'ToTLinuxTSan', # https://crbug.com/368525
'Mac10.10 Tests', # https://crbug.com/828031
'Mac10.13 Tests', # https://crbug.com/1042757
'Linux TSan Tests', # https://crbug.com/368525
'Win10 Tests x64 (dbg)',
......@@ -1153,6 +1167,7 @@
},
'content_shell_crash_test': {
'remove_from': [
'Mac10.10 Tests', # crbug.com/1138050
'Mac10.11 Tests', # crbug.com/1138050
'android-marshmallow-x86-rel-non-cq', # crbug.com/1084353
],
......@@ -1908,6 +1923,7 @@
'Win7 Tests (1)', # For swarming capacity reasons.
'Win10 Tests x64 (dbg)', # Matches browser_tests.
# Only run network service tests on Mac 10.12 for capacity reasons.
'Mac10.10 Tests',
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
......@@ -1943,6 +1959,7 @@
'Win7 Tests (1)', # For swarming capacity reasons.
'Win10 Tests x64 (dbg)', # Matches components_browsertests.
# Only run network service tests on Mac 10.12 for capacity reasons.
'Mac10.10 Tests',
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
......@@ -1959,6 +1976,7 @@
'Win7 Tests (1)', # For swarming capacity reasons.
'Win10 Tests x64 (dbg)', # flaky: https://crbug.com/852786
# Only run network service tests on Mac 10.12 for capacity reasons.
'Mac10.10 Tests',
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
......@@ -1974,6 +1992,7 @@
'Win7 Tests (1)', # For swarming capacity reasons.
'Win10 Tests x64 (dbg)', # Matches extensions_browsertests.
# Only run network service tests on Mac 10.12 for capacity reasons.
'Mac10.10 Tests',
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
......@@ -1994,6 +2013,7 @@
'Linux TSan Tests', # No capacity, https://crbug.com/852442
'Win7 Tests (1)', # For swarming capacity reasons.
# Only run network service tests on Mac 10.12 for capacity reasons.
'Mac10.10 Tests',
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
......@@ -2626,6 +2646,11 @@
],
},
# Disable parallelism on all Mac bots.
'Mac10.10 Tests': {
'args': [
'--jobs=1',
],
},
'Mac10.11 Tests': {
'args': [
'--jobs=1',
......@@ -2666,6 +2691,7 @@
'android-nougat-arm64-rel', # crbug.com/1108124
'android-pie-arm64-rel',
# crbug.com/936540
'Mac10.10 Tests',
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
......@@ -2687,6 +2713,7 @@
},
'remove_from': [
# crbug.com/936540
'Mac10.10 Tests',
'Mac10.11 Tests',
'Win10 Tests x64',
......
testing/buildbot/waterfalls.pyl
View file @ ce0f2cd4
......@@ -4736,6 +4736,16 @@
'all',
],
},
'Mac10.10 Tests': {
'mixins': [
'mac_10.10',
'no_gpu',
],
'test_suites': {
'gtest_tests': 'chromium_mac_gtests_no_nacl',
'isolated_scripts': 'chromium_mac_rel_isolated_scripts',
},
},
'Mac10.11 Tests': {
'mixins': [
'mac_10.11',
......@@ -5257,6 +5267,15 @@
'name': 'chromium.updater',
'mixins': ['chromium-tester-service-account'],
'machines': {
'mac10.10-updater-tester-rel': {
'mixins': [
'mac_10.10',
],
'test_suites': {
'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
},
},
'mac10.11-updater-tester-rel': {
'mixins': [
'mac_10.11',
......
tools/mb/mb_config.pyl
View file @ ce0f2cd4
......@@ -1034,6 +1034,7 @@
'ios-simulator-noncq': 'ios_simulator_debug_static_rbe_bot_xctest',
'ios-simulator-multi-window': 'ios_simulator_debug_static_bot_multi_window_xctest',
'mac-osxbeta-rel': 'gpu_tests_release_trybot_deterministic_mac',
'mac_chromium_10.10': 'gpu_tests_release_trybot_deterministic_mac',
'mac_chromium_10.12_rel_ng': 'gpu_tests_release_trybot_deterministic_mac',
'mac_chromium_10.13_rel_ng': 'release_trybot',
'mac_chromium_10.14_rel_ng': 'release_trybot',
......
tools/mb/mb_config_expectations/tryserver.chromium.mac.json
View file @ ce0f2cd4
......@@ -454,6 +454,18 @@
"use_goma": true
}
},
"mac_chromium_10.10": {
"gn_args": {
"dcheck_always_on": true,
"ffmpeg_branding": "Chrome",
"is_component_build": false,
"is_debug": false,
"mac_deterministic_build": true,
"proprietary_codecs": true,
"symbol_level": 1,
"use_goma": true
}
},
"mac_chromium_10.12_rel_ng": {
"gn_args": {
"dcheck_always_on": true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment