Commit 80c9cda9 authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot

Switch remaining chromium.gpu.fyi Mac testers to Linux VMs.

Set up buildbucket for dawn-mac-x64-deps-rel trybot.

Bug: 950021
Bug: 948902
Change-Id: I0e64633e5f929821676e97039a8afb27644c858d
No-Try: True
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1562617Reviewed-by: default avatarsmut <smut@google.com>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649674}
parent 2fcc0cf2
...@@ -1510,62 +1510,64 @@ buckets { ...@@ -1510,62 +1510,64 @@ buckets {
name: "GPU FYI Mac dEQP Builder" name: "GPU FYI Mac dEQP Builder"
mixins: "mac-gpu-fyi-ci" mixins: "mac-gpu-fyi-ci"
} }
# Note that the Mac testers are all thin Linux VMs, triggering jobs on the
# physical Mac hardware in the Swarming pool, and therefore use the
# linux-dawn-ci mixin.
builders { builders {
name: "Mac FYI 10.14 Release (AMD)" name: "Mac FYI 10.14 Release (AMD)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
mixins: "gpu-slow-bot" mixins: "gpu-slow-bot"
} }
builders { builders {
name: "Mac FYI 10.14 Release (Intel)" name: "Mac FYI 10.14 Release (Intel)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
mixins: "gpu-slow-bot" mixins: "gpu-slow-bot"
} }
builders { builders {
name: "Mac FYI 10.14 Release (NVIDIA)" name: "Mac FYI 10.14 Release (NVIDIA)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
mixins: "gpu-slow-bot" mixins: "gpu-slow-bot"
} }
builders { builders {
name: "Mac FYI Release (Intel)" name: "Mac FYI Release (Intel)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac FYI Debug (Intel)" name: "Mac FYI Debug (Intel)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac Pro FYI Release (AMD)" name: "Mac Pro FYI Release (AMD)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
mixins: "gpu-slow-bot" mixins: "gpu-slow-bot"
} }
builders { builders {
name: "Mac FYI Retina Release (NVIDIA)" name: "Mac FYI Retina Release (NVIDIA)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac FYI Retina Debug (NVIDIA)" name: "Mac FYI Retina Debug (NVIDIA)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
# TODO(kbr): testing running this on a thin Linux VM.
name: "Mac FYI Retina Release (AMD)" name: "Mac FYI Retina Release (AMD)"
mixins: "linux-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac FYI Retina Debug (AMD)" name: "Mac FYI Retina Debug (AMD)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac FYI Experimental Release (Intel)" name: "Mac FYI Experimental Release (Intel)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac FYI Experimental Retina Release (AMD)" name: "Mac FYI Experimental Retina Release (AMD)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac FYI Experimental Retina Release (NVIDIA)" name: "Mac FYI Experimental Retina Release (NVIDIA)"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
# This bot has one machine backing its tests at the moment. # This bot has one machine backing its tests at the moment.
# If it gets more, this should be switched back to gpu-slow-bot. # If it gets more, this should be switched back to gpu-slow-bot.
# See crbug.com/853307 for more context. # See crbug.com/853307 for more context.
...@@ -1573,16 +1575,16 @@ buckets { ...@@ -1573,16 +1575,16 @@ buckets {
} }
builders { builders {
name: "Mac FYI GPU ASAN Release" name: "Mac FYI GPU ASAN Release"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
execution_timeout_secs: 14400 # 4h execution_timeout_secs: 14400 # 4h
} }
builders { builders {
name: "Mac FYI dEQP Release AMD" name: "Mac FYI dEQP Release AMD"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
builders { builders {
name: "Mac FYI dEQP Release Intel" name: "Mac FYI dEQP Release Intel"
mixins: "mac-gpu-fyi-ci" mixins: "linux-gpu-fyi-ci"
} }
# iOS bots. # iOS bots.
...@@ -3660,6 +3662,7 @@ buckets { ...@@ -3660,6 +3662,7 @@ buckets {
builders { mixins: "ios-try" name: "ios-simulator-eg" } builders { mixins: "ios-try" name: "ios-simulator-eg" }
builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" } builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }
builders { mixins: "ios-try" name: "ios-slimnav" } builders { mixins: "ios-try" name: "ios-slimnav" }
builders { mixins: "mac-dawn-try" name: "dawn-mac-x64-deps-rel" }
builders { mixins: "mac-angle-try" name: "mac-angle-rel" } builders { mixins: "mac-angle-try" name: "mac-angle-rel" }
builders { mixins: "mac-angle-try" name: "mac_angle_compile_dbg_ng" } builders { mixins: "mac-angle-try" name: "mac_angle_compile_dbg_ng" }
builders { mixins: "mac-angle-try" name: "mac_angle_dbg_ng" } builders { mixins: "mac-angle-try" name: "mac_angle_dbg_ng" }
......
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