Skip to content

GitLab

T
tangled
Commit 3a329267 authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot
Browse files
Options

Begin the upgrade of the NVIDIA GPU bots from Windows 7 to 10. 

Allow jobs on the majority of the waterfall bots and trybots to target
either one of these configurations, depending on which one has the
most capacity.

TBR=jmadill@chromium.org, geofflang@chromium.org
NOTRY=true

Bug: 711839
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I83dfb0cd1990c134decc1bc10b9db5b8e788f60d
Reviewed-on: https://chromium-review.googlesource.com/882344
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531752}
parent af3f076a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 72 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 3a329267
...@@ -145,6 +145,13 @@ WATERFALL = { ...@@ -145,6 +145,13 @@ WATERFALL = {
'swarming': True, 'swarming': True,
'os_type': 'win', 'os_type': 'win',
'use_gpu_trigger_script': True, 'use_gpu_trigger_script': True,
'alternate_swarming_dimensions': [
{
'gpu': WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER,
'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
'pool': 'Chrome-GPU',
},
],
}, },
'Win7 Debug (NVIDIA)': { 'Win7 Debug (NVIDIA)': {
'swarming_dimensions': [ 'swarming_dimensions': [
...@@ -278,6 +285,13 @@ FYI_WATERFALL = { ...@@ -278,6 +285,13 @@ FYI_WATERFALL = {
'swarming': True, 'swarming': True,
'os_type': 'win', 'os_type': 'win',
'use_gpu_trigger_script': True, 'use_gpu_trigger_script': True,
'alternate_swarming_dimensions': [
{
'gpu': WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER,
'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
'pool': 'Chrome-GPU',
},
],
}, },
'Win7 Debug (NVIDIA)': { 'Win7 Debug (NVIDIA)': {
'swarming_dimensions': [ 'swarming_dimensions': [
...@@ -304,6 +318,13 @@ FYI_WATERFALL = { ...@@ -304,6 +318,13 @@ FYI_WATERFALL = {
'os_type': 'win', 'os_type': 'win',
'type': Types.DEQP, 'type': Types.DEQP,
'use_gpu_trigger_script': True, 'use_gpu_trigger_script': True,
'alternate_swarming_dimensions': [
{
'gpu': WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER,
'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
'pool': 'Chrome-GPU',
},
],
}, },
'Win7 Experimental Release (NVIDIA)': { 'Win7 Experimental Release (NVIDIA)': {
'swarming_dimensions': [ 'swarming_dimensions': [
...@@ -821,6 +842,13 @@ FYI_WATERFALL = { ...@@ -821,6 +842,13 @@ FYI_WATERFALL = {
'os_type': 'win', 'os_type': 'win',
'type': Types.OPTIONAL, 'type': Types.OPTIONAL,
'use_gpu_trigger_script': True, 'use_gpu_trigger_script': True,
'alternate_swarming_dimensions': [
{
'gpu': WIN10_NVIDIA_QUADRO_P400_STABLE_DRIVER,
'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
'pool': 'Chrome-GPU',
},
],
}, },
'Optional Mac Release (Intel)': { 'Optional Mac Release (Intel)': {
'swarming_dimensions': [ 'swarming_dimensions': [
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 3a329267
This diff is collapsed.
testing/buildbot/chromium.gpu.json
View file @ 3a329267
...@@ -2810,7 +2810,7 @@ ...@@ -2810,7 +2810,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
}, },
...@@ -2838,7 +2838,7 @@ ...@@ -2838,7 +2838,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
}, },
...@@ -2863,7 +2863,7 @@ ...@@ -2863,7 +2863,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
}, },
...@@ -2889,7 +2889,7 @@ ...@@ -2889,7 +2889,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
}, },
...@@ -2913,7 +2913,7 @@ ...@@ -2913,7 +2913,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
}, },
...@@ -2940,7 +2940,7 @@ ...@@ -2940,7 +2940,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
}, },
...@@ -2975,7 +2975,7 @@ ...@@ -2975,7 +2975,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3007,7 +3007,7 @@ ...@@ -3007,7 +3007,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3039,7 +3039,7 @@ ...@@ -3039,7 +3039,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3071,7 +3071,7 @@ ...@@ -3071,7 +3071,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3107,7 +3107,7 @@ ...@@ -3107,7 +3107,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3146,7 +3146,7 @@ ...@@ -3146,7 +3146,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3193,7 +3193,7 @@ ...@@ -3193,7 +3193,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3226,7 +3226,7 @@ ...@@ -3226,7 +3226,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3258,7 +3258,7 @@ ...@@ -3258,7 +3258,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
...@@ -3291,7 +3291,7 @@ ...@@ -3291,7 +3291,7 @@
"trigger_script": { "trigger_script": {
"args": [ "args": [
"--gpu-trigger-configs", "--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]" "[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}, {\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]"
], ],
"script": "//content/test/gpu/trigger_gpu_test.py" "script": "//content/test/gpu/trigger_gpu_test.py"
} }
......
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