Skip to content

GitLab

T
tangled
Commit 8687ab28 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot
Browse files
Options

Revert "Use linux hosts for all mac triggered testers" 

This reverts commit 8af6bfe2.

Reason for revert: The branched versions have not been updated to run
the non-isolated tests on the builder instead of the tester.

Original change's description:
> Use linux hosts for all mac triggered testers
> 
> We've already shown this to work on Mac10.15 Tests on the FYI
> waterfall, so let's do this for the rest of the Mac triggered
> testers on the main waterfall as well. This will allow us to
> free up some Mac resources to do more important tasks (e.g.
> compile, run tests). It also makes these builders builderless,
> increasing our flexibility and improving our utilization.
> 
> This CL also introduces a new ci.triggered_tester starlark
> function to enable easily specifying builders as "we don't care
> what OS you use", and to enable easily turning all of them into
> "thin testers" if/when we go down that path.
> 
> Bug: 1061582
> Change-Id: Iffd5a4afbadeabc19d9d0e3b28f33151a9474191
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2161689
> Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
> Commit-Queue: Aaron Gable <agable@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#761718}

TBR=ellyjones@chromium.org,agable@chromium.org,gbeaty@chromium.org

Change-Id: I786079f17db5e32643b11bb43775b7e52a44e4cc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1061582
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2163254Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762027}
parent b057987c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 338 deletions
infra/config/buckets/ci.star
View file @ 8687ab28
......@@ -1814,6 +1814,17 @@ ci.fyi_builder(
goma_backend = None,
)
# The only non-isolated tests this runs are scripts which
# work just as well on Linux as on Mac.
ci.fyi_builder(
name = 'Mac10.15 Tests',
console_view_entry = ci.console_view_entry(
category = 'mac',
short_name = '15',
),
triggered_by = ['Mac Builder Next'],
)
ci.fyi_builder(
name = 'win-pixel-builder-rel',
console_view_entry = ci.console_view_entry(
......@@ -2039,16 +2050,6 @@ ci.fyi_mac_builder(
os = None,
)
ci.thin_tester(
name = 'Mac10.15 Tests',
mastername = 'chromium.fyi',
console_view_entry = ci.console_view_entry(
category = 'mac',
short_name = '15',
),
triggered_by = ['Mac Builder Next'],
)
ci.fyi_mac_builder(
name = 'Mac deterministic',
console_view_entry = ci.console_view_entry(
......
infra/config/generated/cr-buildbucket.cfg
View file @ 8687ab28
This diff is collapsed.
infra/config/lib/ci.star
View file @ 8687ab28
......@@ -798,21 +798,6 @@ def swangle_windows_builder(*, name, **kwargs):
)
def thin_tester(
*,
name,
mastername,
triggered_by,
**kwargs):
return ci.builder(
name = name,
mastername = mastername,
triggered_by = triggered_by,
goma_backend = None,
**kwargs
)
def win_builder(*, name, os=builders.os.WINDOWS_DEFAULT, **kwargs):
return ci.builder(
name = name,
......@@ -859,6 +844,5 @@ ci = struct(
swangle_linux_builder = swangle_linux_builder,
swangle_mac_builder = swangle_mac_builder,
swangle_windows_builder = swangle_windows_builder,
thin_tester = thin_tester,
win_builder = win_builder,
)
infra/config/versioned/milestones/m81/buckets/ci.star
View file @ 8687ab28
......@@ -359,9 +359,9 @@ ci.mac_builder(
os = os.MAC_ANY,
)
ci.thin_tester(
# The build runs on 10.13, but triggers tests on 10.10 bots.
ci.mac_builder(
name = 'Mac10.10 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '10',
......@@ -369,9 +369,9 @@ ci.thin_tester(
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
# The build runs on 10.13, but triggers tests on 10.11 bots.
ci.mac_builder(
name = 'Mac10.11 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '11',
......@@ -379,53 +379,53 @@ ci.thin_tester(
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.12 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '12',
),
os = os.MAC_10_12,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.13 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '13',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.14 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '14',
),
os = os.MAC_10_14,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.13 Tests (dbg)',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'debug',
short_name = '13',
),
os = os.MAC_ANY,
triggered_by = [builder_name('Mac Builder (dbg)')],
)
ci.thin_tester(
ci.mac_builder(
name = 'WebKit Mac10.13 (retina)',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'ret',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
......
infra/config/versioned/milestones/m83/buckets/ci.star
View file @ 8687ab28
......@@ -670,9 +670,9 @@ ci.mac_builder(
os = os.MAC_ANY,
)
ci.thin_tester(
# The build runs on 10.13, but triggers tests on 10.10 bots.
ci.mac_builder(
name = 'Mac10.10 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '10',
......@@ -680,9 +680,9 @@ ci.thin_tester(
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
# The build runs on 10.13, but triggers tests on 10.11 bots.
ci.mac_builder(
name = 'Mac10.11 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '11',
......@@ -690,53 +690,53 @@ ci.thin_tester(
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.12 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '12',
),
os = os.MAC_10_12,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.13 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '13',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.14 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '14',
),
os = os.MAC_10_14,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.13 Tests (dbg)',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'debug',
short_name = '13',
),
os = os.MAC_ANY,
triggered_by = [builder_name('Mac Builder (dbg)')],
)
ci.thin_tester(
ci.mac_builder(
name = 'WebKit Mac10.13 (retina)',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'ret',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
......
infra/config/versioned/trunk/buckets/ci.star
View file @ 8687ab28
......@@ -676,9 +676,9 @@ ci.mac_builder(
os = os.MAC_ANY,
)
ci.thin_tester(
# The build runs on 10.13, but triggers tests on 10.10 bots.
ci.mac_builder(
name = 'Mac10.10 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '10',
......@@ -686,9 +686,9 @@ ci.thin_tester(
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
# The build runs on 10.13, but triggers tests on 10.11 bots.
ci.mac_builder(
name = 'Mac10.11 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '11',
......@@ -696,53 +696,53 @@ ci.thin_tester(
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.12 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '12',
),
os = os.MAC_10_12,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.13 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '13',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.14 Tests',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '14',
),
os = os.MAC_10_14,
triggered_by = [builder_name('Mac Builder')],
)
ci.thin_tester(
ci.mac_builder(
name = 'Mac10.13 Tests (dbg)',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'debug',
short_name = '13',
),
os = os.MAC_ANY,
triggered_by = [builder_name('Mac Builder (dbg)')],
)
ci.thin_tester(
ci.mac_builder(
name = 'WebKit Mac10.13 (retina)',
mastername = 'chromium.mac',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'ret',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
......
testing/buildbot/chromium.ci.json
View file @ 8687ab28
This diff is collapsed.
testing/buildbot/chromium.fyi.json
View file @ 8687ab28
This diff is collapsed.
testing/buildbot/waterfalls.pyl
View file @ 8687ab28
......@@ -1753,7 +1753,6 @@
'Mac10.15 Tests': {
'mixins': [
'mac_10.15',
'no_gpu',
],
'test_suites': {
'gtest_tests': 'chromium_mac_gtests',
......
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