Skip to content

GitLab

T
tangled
Commit 630672d6 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot
Browse files
Options

Make Mac10.X Tests builders into thin testers 

This will free up a small amount of Mac hardware which can be
used elsewhere. It also creates a template for other OSes with
builder/tester splits to follow.

We know that this works because the mac-osxbeta-rel CI builder
already does this (as can be seen by the smaller diff in its
generated config).

Bug: 1003062
Change-Id: Iecdb68404dd3ae16eabfc657981f0e82478a040a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974510
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726077}
parent ebc8309b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 162 deletions
infra/config/buckets/ci.star
View file @ 630672d6
......@@ -1293,12 +1293,6 @@ fyi_mac_builder(
os = os.MAC_10_14,
)
fyi_mac_builder(
name = 'Mac10.14 Tests',
cores = None,
os = os.MAC_10_14,
)
fyi_mac_builder(
name = 'Mac deterministic',
cores = None,
......@@ -1922,11 +1916,6 @@ mac_builder(
os = os.MAC_ANY,
)
mac_builder(
name = 'Mac10.13 Tests (dbg)',
os = os.MAC_ANY,
)
def mac_ios_builder(*, name, **kwargs):
return mac_builder(
name = name,
......@@ -2170,6 +2159,31 @@ swangle_windows_builder(
)
# Thin testers are triggered builders which simply trigger swarmed
# tests and collect their results. The OS they run on doesn't matter,
# and they don't do anything computationally intensive, so use 2-core
# Linux hosts.
def thin_tester(*, name, mastername, **kwargs):
return builder(
name = name,
mastername = mastername,
builderless = True,
cores = 2,
os = os.LINUX_DEFAULT,
**kwargs
)
thin_tester(
name = 'Mac10.13 Tests (dbg)',
mastername = 'chromium.mac',
)
thin_tester(
name = 'Mac10.14 Tests',
mastername = 'chromium.fyi',
)
def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
return builder(
name = name,
......
infra/config/generated/cr-buildbucket.cfg
View file @ 630672d6
This diff is collapsed.
infra/config/versioned/milestones/m79/buckets/ci.star
View file @ 630672d6
......@@ -96,13 +96,6 @@ def fyi_builder(
**kwargs
)
# This is launching & collecting entirely isolated tests.
# OS shouldn't matter.
fyi_builder(
name = 'mac-osxbeta-rel',
goma_backend = goma.backend.RBE_PROD,
)
def fyi_windows_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
return fyi_builder(
......@@ -213,44 +206,64 @@ mac_builder(
name = 'Mac Builder',
)
# The build runs on 10.13, but triggers tests on 10.10 bots.
mac_builder(
def mac_ios_builder(*, name, **kwargs):
return mac_builder(
name = name,
caches = [XCODE_IOS_11_CACHE],
executable = luci.recipe(name = 'ios/unified_builder_tester'),
goma_backend = None,
os = os.MAC_ANY,
**kwargs
)
mac_ios_builder(
name = 'ios-simulator',
)
# Thin testers are triggered builders which simply trigger swarmed
# tests and collect their results. The OS they run on doesn't matter,
# and they don't do anything computationally intensive, so use 2-core
# Linux hosts.
def thin_tester(*, name, mastername, **kwargs):
return builder(
name = name,
mastername = mastername,
builderless = True,
cores = 2,
os = os.LINUX_DEFAULT,
**kwargs
)
thin_tester(
name = 'Mac10.10 Tests',
mastername = 'chromium.mac',
)
# The build runs on 10.13, but triggers tests on 10.11 bots.
mac_builder(
thin_tester(
name = 'Mac10.11 Tests',
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'Mac10.12 Tests',
os = os.MAC_10_12,
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'Mac10.13 Tests',
os = os.MAC_10_13,
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'WebKit Mac10.13 (retina)',
os = os.MAC_10_13,
mastername = 'chromium.mac',
)
def mac_ios_builder(*, name, **kwargs):
return mac_builder(
name = name,
caches = [XCODE_IOS_11_CACHE],
executable = luci.recipe(name = 'ios/unified_builder_tester'),
goma_backend = None,
os = os.MAC_ANY,
**kwargs
)
mac_ios_builder(
name = 'ios-simulator',
thin_tester(
name = 'mac-osxbeta-rel',
mastername = 'chromium.fyi',
)
......
infra/config/versioned/milestones/m80/buckets/ci.star
View file @ 630672d6
......@@ -96,13 +96,6 @@ def fyi_builder(
**kwargs
)
# This is launching & collecting entirely isolated tests.
# OS shouldn't matter.
fyi_builder(
name = 'mac-osxbeta-rel',
goma_backend = goma.backend.RBE_PROD,
)
def fyi_windows_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
return fyi_builder(
......@@ -213,44 +206,64 @@ mac_builder(
name = 'Mac Builder',
)
# The build runs on 10.13, but triggers tests on 10.10 bots.
mac_builder(
def mac_ios_builder(*, name, **kwargs):
return mac_builder(
name = name,
caches = [XCODE_IOS_11_CACHE],
executable = luci.recipe(name = 'ios/unified_builder_tester'),
goma_backend = None,
os = os.MAC_ANY,
**kwargs
)
mac_ios_builder(
name = 'ios-simulator',
)
# Thin testers are triggered builders which simply trigger swarmed
# tests and collect their results. The OS they run on doesn't matter,
# and they don't do anything computationally intensive, so use 2-core
# Linux hosts.
def thin_tester(*, name, mastername, **kwargs):
return builder(
name = name,
mastername = mastername,
builderless = True,
cores = 2,
os = os.LINUX_DEFAULT,
**kwargs
)
thin_tester(
name = 'Mac10.10 Tests',
mastername = 'chromium.mac',
)
# The build runs on 10.13, but triggers tests on 10.11 bots.
mac_builder(
thin_tester(
name = 'Mac10.11 Tests',
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'Mac10.12 Tests',
os = os.MAC_10_12,
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'Mac10.13 Tests',
os = os.MAC_10_13,
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'WebKit Mac10.13 (retina)',
os = os.MAC_10_13,
mastername = 'chromium.mac',
)
def mac_ios_builder(*, name, **kwargs):
return mac_builder(
name = name,
caches = [XCODE_IOS_11_CACHE],
executable = luci.recipe(name = 'ios/unified_builder_tester'),
goma_backend = None,
os = os.MAC_ANY,
**kwargs
)
mac_ios_builder(
name = 'ios-simulator',
thin_tester(
name = 'mac-osxbeta-rel',
mastername = 'chromium.fyi',
)
......
infra/config/versioned/trunk/buckets/ci.star
View file @ 630672d6
......@@ -96,13 +96,6 @@ def fyi_builder(
**kwargs
)
# This is launching & collecting entirely isolated tests.
# OS shouldn't matter.
fyi_builder(
name = 'mac-osxbeta-rel',
goma_backend = goma.backend.RBE_PROD,
)
def fyi_windows_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
return fyi_builder(
......@@ -213,44 +206,64 @@ mac_builder(
name = 'Mac Builder',
)
# The build runs on 10.13, but triggers tests on 10.10 bots.
mac_builder(
def mac_ios_builder(*, name, **kwargs):
return mac_builder(
name = name,
caches = [XCODE_IOS_11_CACHE],
executable = luci.recipe(name = 'ios/unified_builder_tester'),
goma_backend = None,
os = os.MAC_ANY,
**kwargs
)
mac_ios_builder(
name = 'ios-simulator',
)
# Thin testers are triggered builders which simply trigger swarmed
# tests and collect their results. The OS they run on doesn't matter,
# and they don't do anything computationally intensive, so use 2-core
# Linux hosts.
def thin_tester(*, name, mastername, **kwargs):
return builder(
name = name,
mastername = mastername,
builderless = True,
cores = 2,
os = os.LINUX_DEFAULT,
**kwargs
)
thin_tester(
name = 'Mac10.10 Tests',
mastername = 'chromium.mac',
)
# The build runs on 10.13, but triggers tests on 10.11 bots.
mac_builder(
thin_tester(
name = 'Mac10.11 Tests',
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'Mac10.12 Tests',
os = os.MAC_10_12,
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'Mac10.13 Tests',
os = os.MAC_10_13,
mastername = 'chromium.mac',
)
mac_builder(
thin_tester(
name = 'WebKit Mac10.13 (retina)',
os = os.MAC_10_13,
mastername = 'chromium.mac',
)
def mac_ios_builder(*, name, **kwargs):
return mac_builder(
name = name,
caches = [XCODE_IOS_11_CACHE],
executable = luci.recipe(name = 'ios/unified_builder_tester'),
goma_backend = None,
os = os.MAC_ANY,
**kwargs
)
mac_ios_builder(
name = 'ios-simulator',
thin_tester(
name = 'mac-osxbeta-rel',
mastername = 'chromium.fyi',
)
......
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