Skip to content

GitLab

T
tangled
Commit 5dbbffbe authored by kbr's avatar kbr Committed by Commit bot
Browse files
Options

Add JSON descriptions for the current chromium.gpu.fyi bots. 

This is in preparation for switching these bots to the Chromium recipe.

The only thing of note is that the angle_deqp_gles3_tests will not be
run on the Linux Release dEQP (NVIDIA) bot yet, to match their current
configuration.

BUG=542370
TBR=dpranke@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/1642293002

Cr-Commit-Position: refs/heads/master@{#372206}
parent f72134ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5771 additions and 500 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 5dbbffbe
......@@ -20,34 +20,87 @@ BUILDERS = [
'GPU NextGen Mac Builder (dbg)',
'GPU NextGen Win Builder',
'GPU NextGen Win Builder (dbg)',
'GPU Win Builder',
'GPU Win Builder (dbg)',
'GPU Mac Builder',
'GPU Mac Builder (dbg)',
'GPU Linux Builder',
'GPU Linux Builder (dbg)',
]
TESTERS = {
'Linux NextGen Debug (NVIDIA)': {
# FYI bots, matching the order on the waterfall.
'Win7 Release (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Linux'
'os': 'Windows-2008ServerR2-SP1'
},
'build_config': 'Release',
'swarming': True,
'os_type': 'win',
},
'Win7 Debug (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Windows-2008ServerR2-SP1'
},
'build_config': 'Debug',
'swarming': True,
'os_type': 'linux',
'os_type': 'win',
},
'Linux NextGen Release (NVIDIA)': {
'Win8 Release (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Linux'
'os': 'Windows-2012ServerR2-SP0'
},
'build_config': 'Release',
'swarming': True,
'os_type': 'linux',
'os_type': 'win',
},
'Mac 10.10 Debug (ATI)': {
'Win8 Debug (NVIDIA)': {
'swarming_dimensions': {
'gpu': '1002:679e',
'gpu': '10de:104a',
'os': 'Windows-2012ServerR2-SP0'
},
'build_config': 'Debug',
'swarming': True,
'os_type': 'win',
},
'Win7 Release (ATI)': {
'swarming_dimensions': {
'gpu': '1002:6779',
'os': 'Windows-2008ServerR2-SP1'
},
'build_config': 'Release',
'swarming': True,
'os_type': 'win',
},
'Win7 Release dEQP (NVIDIA)': {
'deqp': True,
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Windows-2008ServerR2-SP1'
},
'build_config': 'Release',
'swarming': True,
'os_type': 'win',
},
'Mac 10.10 Release (Intel)': {
'swarming_dimensions': {
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
},
'build_config': 'Release',
'swarming': True,
'os_type': 'mac',
},
'Mac 10.10 Debug (Intel)': {
'swarming_dimensions': {
'gpu': '8086:0a2e',
'os': 'Mac-10.10'
},
'build_config': 'Debug',
'swarming': False,
'swarming': True,
'os_type': 'mac',
},
'Mac 10.10 Release (ATI)': {
......@@ -56,29 +109,127 @@ TESTERS = {
'os': 'Mac-10.10'
},
'build_config': 'Release',
# This bot is a one-off and doesn't have similar slaves in the
# swarming pool.
'swarming': False,
'os_type': 'mac',
},
'Mac NextGen 10.10 Retina Debug (AMD)': {
'Mac 10.10 Debug (ATI)': {
'swarming_dimensions': {
'gpu': '1002:679e',
'os': 'Mac-10.10'
},
'build_config': 'Debug',
# This bot is a one-off and doesn't have similar slaves in the
# swarming pool.
'swarming': False,
'os_type': 'mac',
},
'Mac 10.10 Retina Release (AMD)': {
'swarming_dimensions': {
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.10'
},
'build_config': 'Debug',
'build_config': 'Release',
'swarming': True,
'os_type': 'mac',
},
'Mac NextGen 10.10 Retina Release (AMD)': {
'Mac 10.10 Retina Debug (AMD)': {
'swarming_dimensions': {
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.10'
},
'build_config': 'Release',
'build_config': 'Debug',
'swarming': True,
'os_type': 'mac',
},
'Linux Release (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Linux'
},
'build_config': 'Release',
'swarming': True,
'os_type': 'linux',
},
'Linux Release (Intel)': {
'swarming_dimensions': {
'gpu': '8086:041a',
'os': 'Linux'
},
'build_config': 'Release',
# This bot is a one-off and doesn't have similar slaves in the
# swarming pool.
'swarming': False,
'os_type': 'linux',
},
'Linux Release (Intel Graphics Stack)': {
'swarming_dimensions': {
'gpu': '8086:041a',
'os': 'Linux'
},
'build_config': 'Release',
# This bot is a one-off and doesn't have similar slaves in the
# swarming pool.
'swarming': False,
'os_type': 'linux',
},
'Linux Release (ATI)': {
'swarming_dimensions': {
'gpu': '1002:6779',
'os': 'Linux'
},
'build_config': 'Release',
# This bot is a one-off and doesn't have similar slaves in the
# swarming pool.
'swarming': False,
'os_type': 'linux',
},
'Linux Debug (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Linux'
},
'build_config': 'Debug',
'swarming': True,
'os_type': 'linux',
},
'Linux Release dEQP (NVIDIA)': {
'deqp': True,
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Linux'
},
'build_config': 'Release',
# TODO(kbr): switch this to use Swarming, and put the physical
# machine into the Swarming pool, once we're convinced it's
# working well.
'swarming': False,
'os_type': 'linux',
},
# NextGen bots (to be removed once the above bots are switched to
# the Chromium recipe)
'Linux NextGen Debug (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Linux'
},
'build_config': 'Debug',
'swarming': True,
'os_type': 'linux',
},
'Linux NextGen Release (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
'os': 'Linux'
},
'build_config': 'Release',
'swarming': True,
'os_type': 'linux',
},
'Win7 NextGen Debug (NVIDIA)': {
'swarming_dimensions': {
'gpu': '10de:104a',
......@@ -217,7 +368,7 @@ FYI_ONLY_GTESTS = {
DEQP_GTESTS = {
'angle_deqp_gles2_tests': {'swarming_shards': 4},
'angle_deqp_gles3_tests': {'swarming_shards': 12},
'angle_deqp_gles3_tests': {'win_only': True, 'swarming_shards': 12},
}
TELEMETRY_TESTS = {
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 5dbbffbe
This diff is collapsed.
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