The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d5dd548892729c4774050fc0e04f681e38c44b66

commit d5dd548892729c4774050fc0e04f681e38c44b66
Author: Kenneth Russell <kbr@chromium.org>
Date: Wed May 23 00:31:46 2018

Clean up GPU generate_buildbot_json.py.

Eliminate some useless constructs from the generated JSON before
folding this script into the version in src/testing/buildbot, to
reduce the amount of emulation code needed in order to generate
exactly the same JSON.

1) Stop specifying use_xvfb for gtests. It only applied to non-Swarmed
Linux bots, and at this point all of the GPU bots are Swarmed,
including those on chromium.gpu.fyi.

2) Stop specifying both override_compile_targets and isolate_name.
isolate_name is sufficient to tell the Chromium recipe which target to
build and run.

Bug:  844815 
Tbr: ynovikov@chromium.org
Tbr: geofflang@chromium.org
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ifaabad82fd83737ee126ec0725692eb3be35b6f4
Reviewed-on: https://chromium-review.googlesource.com/1067088
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560854}
[modify] https://crrev.com/d5dd548892729c4774050fc0e04f681e38c44b66/content/test/gpu/generate_buildbot_json.py
[modify] https://crrev.com/d5dd548892729c4774050fc0e04f681e38c44b66/testing/buildbot/chromium.gpu.fyi.json
[modify] https://crrev.com/d5dd548892729c4774050fc0e04f681e38c44b66/testing/buildbot/chromium.gpu.json
[modify] https://crrev.com/d5dd548892729c4774050fc0e04f681e38c44b66/testing/buildbot/client.v8.fyi.json

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d2e54678f1f0a74544dbaf19a55247fcd90f3ec9

commit d2e54678f1f0a74544dbaf19a55247fcd90f3ec9
Author: Kenneth Russell <kbr@chromium.org>
Date: Wed May 30 23:47:42 2018

More cleanups to generate_buildbot_json's output.

Sort gtests in the same way the src/testing/buildbot version does, to
minimize differences when switching over to that script.

Apply swarming_settings to gtests, not just isolated_scripts.

Tbr: ynovikov@chromium.org
Tbr: geofflang@chromium.org
Bug:  844815 
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ifd791b9e459230f78b020bf46f031b3d3691e64a
Reviewed-on: https://chromium-review.googlesource.com/1079850
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563068}
[modify] https://crrev.com/d2e54678f1f0a74544dbaf19a55247fcd90f3ec9/content/test/gpu/generate_buildbot_json.py
[modify] https://crrev.com/d2e54678f1f0a74544dbaf19a55247fcd90f3ec9/testing/buildbot/chromium.gpu.fyi.json
[modify] https://crrev.com/d2e54678f1f0a74544dbaf19a55247fcd90f3ec9/testing/buildbot/chromium.gpu.json
[modify] https://crrev.com/d2e54678f1f0a74544dbaf19a55247fcd90f3ec9/testing/buildbot/client.v8.fyi.json

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8a386d43f325f1d884b8ec5b6b470a2ab6422971

commit 8a386d43f325f1d884b8ec5b6b470a2ab6422971
Author: Kenneth Russell <kbr@chromium.org>
Date: Sat Jun 02 09:48:01 2018

Merge GPU generate_buildbot_json.py into testing/buildbot version.

Redefine the chromium.gpu, chromium.gpu.fyi and client.v8.fyi
waterfalls and test suites in waterfalls.pyl and test_suites.pyl,
respectively.

The goal of this conversion was to generate these three waterfalls'
JSON files almost exactly as they currently are, which has been
achieved. There are however many cleanups that should be done to
simplify the test suites and the configurations of the GPU bots, which
will be done in follow-on CLs and bugs.

Added a few needed features to the testing/buildbot version of the
generator script. Covered these in the unit tests; the coverage test
continues to pass. Deleted the old GPU script and updated docs that
referred to it.

Tbr: dpranke@chromium.org
Tbr: jbudorick@chromium.org
Tbr: ynovikov@chromium.org
Tbr: geofflang@chromium.org
Tbr: jmadill@chromium.org
Bug:  844815 
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I4e472d0e55a700fe3cec5043dcd260d31de8fd41
Reviewed-on: https://chromium-review.googlesource.com/1067132
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563939}
[delete] https://crrev.com/aa4a890e4c03483ce42e217103ecc8f7eec5c4f4/content/test/gpu/generate_buildbot_json.py
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/docs/gpu/gpu_testing.md
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/docs/gpu/gpu_testing_bot_details.md
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/docs/gpu/pixel_wrangling.md
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/chromium.gpu.fyi.json
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/chromium.gpu.json
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/client.v8.fyi.json
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/generate_buildbot_json.py
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/generate_buildbot_json_unittest.py
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/test_suite_exceptions.pyl
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/test_suites.pyl
[modify] https://crrev.com/8a386d43f325f1d884b8ec5b6b470a2ab6422971/testing/buildbot/waterfalls.pyl

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5612d64a3c222356bc5f994a9433059a608a36c1

commit 5612d64a3c222356bc5f994a9433059a608a36c1
Author: Kenneth Russell <kbr@chromium.org>
Date: Sat Jun 02 21:12:30 2018

Cleanup GPU Android bot definitions.

Stop specifying the 'skip_gs_results_bucket' and
'skip_device_recovery' flags for the Android GPU bots, to make their
specification the same as other Android bots.

Remove support for these two flags from the generate_buildbot_json
script.

Tbr: jbudorick@chromium.org
Tbr: ynovikov@chromium.org
Bug:  844815 
Change-Id: I5f2e053cffbeefd4e81896126d57b23ce10a6cc4
Reviewed-on: https://chromium-review.googlesource.com/1084067
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563948}
[modify] https://crrev.com/5612d64a3c222356bc5f994a9433059a608a36c1/testing/buildbot/chromium.gpu.fyi.json
[modify] https://crrev.com/5612d64a3c222356bc5f994a9433059a608a36c1/testing/buildbot/generate_buildbot_json.py
[modify] https://crrev.com/5612d64a3c222356bc5f994a9433059a608a36c1/testing/buildbot/generate_buildbot_json_unittest.py
[modify] https://crrev.com/5612d64a3c222356bc5f994a9433059a608a36c1/testing/buildbot/waterfalls.pyl

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/1ea56e778700528d7c8e77bedecb62856cf78f84

commit 1ea56e778700528d7c8e77bedecb62856cf78f84
Author: Kenneth Russell <kbr@chromium.org>
Date: Sat Jun 02 23:30:43 2018

Run more GPU FYI tests on Windows optional tryservers.

This moves the following waterfall-only tests onto the optional
Windows trybots, too:

  angle_gles1_conformance_tests
  video_decode_accelerator_d3d9_unittest
  video_decode_accelerator_gl_unittest

It looked like it might have been an oversight that these were tested
on the waterfall but not the CQ.

Tbr: geofflang@chromium.org
Tbr: hubbe@chromium.org
Tbr: mcasas@chromium.org
Bug:  844815 
Change-Id: Ic64e4cbcab1f108c043850653925f144dea59b1f
Reviewed-on: https://chromium-review.googlesource.com/1083853
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563954}
[modify] https://crrev.com/1ea56e778700528d7c8e77bedecb62856cf78f84/testing/buildbot/chromium.gpu.fyi.json
[modify] https://crrev.com/1ea56e778700528d7c8e77bedecb62856cf78f84/testing/buildbot/test_suites.pyl

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0272ab783002280eea5b5f04ddef7480921a6fd8

commit 0272ab783002280eea5b5f04ddef7480921a6fd8
Author: Kenneth Russell <kbr@chromium.org>
Date: Mon Jun 04 17:22:24 2018

Remove video_decode_accelerator_gl_unittest from Optional Win/Intel.

This test was recently moved to run on the optional tryservers but it
was missed that this would cause it to run on Win/Intel where it is
excluded on the waterfall.

Tbr: geofflang@chromium.org
Tbr: hubbe@chromium.org
Tbr: mcasas@chromium.org
Bug:  844815 
Change-Id: I575fbb39abe6ae715f3233ba9fb30b2820a8369b
Reviewed-on: https://chromium-review.googlesource.com/1085485
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564133}
[modify] https://crrev.com/0272ab783002280eea5b5f04ddef7480921a6fd8/testing/buildbot/chromium.gpu.fyi.json
[modify] https://crrev.com/0272ab783002280eea5b5f04ddef7480921a6fd8/testing/buildbot/test_suite_exceptions.pyl

This is essentially done. More cleanups to come in Issue 850252.

 Issue 583168  has been merged into this issue.