The generate_buildbot_json.py script which creates a few JSON files in src/testing/buildbot/ has gotten a little out of hand. There are multiple boolean values passed among several functions which are difficult to maintain.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/0a1b40c403c124cd9c0338fb806d442c0e78f143 commit 0a1b40c403c124cd9c0338fb806d442c0e78f143 Author: kbr <kbr@chromium.org> Date: Mon Feb 06 02:32:38 2017 Clean up generate_buildbot_json.py. Get rid of the fyi_only, run_on_optional, run_on_v8, and allow_on_android flags. Express these in terms of predicates which take into account both the type of the waterfall and the individual bot (or, in the case of Android, disabled_tester_configs). Pure refactoring; JSON files generated by the script are unchanged. BUG= 688887 CQ_INCLUDE_TRYBOTS=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;master.tryserver.chromium.android:android_optional_gpu_tests_rel TBR=zmo@chromium.org NOTRY=true Review-Url: https://codereview.chromium.org/2675153002 Cr-Commit-Position: refs/heads/master@{#448205} [modify] https://crrev.com/0a1b40c403c124cd9c0338fb806d442c0e78f143/content/test/gpu/generate_buildbot_json.py
Expanding the summary of this bug to include cleaning up the now-incorrect names of many of the Mac bots.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/ced48e27c14c41ae8f1924059cd90b3944d001f7 commit ced48e27c14c41ae8f1924059cd90b3944d001f7 Author: kbr <kbr@chromium.org> Date: Mon Feb 06 05:42:54 2017 Clean up now-incorrect names of many of the Mac GPU bots. Removed the OS version from the names, as it was incorrect in almost all cases. This will lose history on these bots, but they've been green for quite a long time now, so this seems like a good time to make the switch. BUG= 688887 CQ_INCLUDE_TRYBOTS=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;master.tryserver.chromium.android:android_optional_gpu_tests_rel TBR=zmo@chromium.org NOTRY=true Review-Url: https://codereview.chromium.org/2679543002 Cr-Commit-Position: refs/heads/master@{#448214} [modify] https://crrev.com/ced48e27c14c41ae8f1924059cd90b3944d001f7/content/test/gpu/generate_buildbot_json.py [modify] https://crrev.com/ced48e27c14c41ae8f1924059cd90b3944d001f7/testing/buildbot/chromium.gpu.fyi.json [modify] https://crrev.com/ced48e27c14c41ae8f1924059cd90b3944d001f7/testing/buildbot/chromium.gpu.json
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build/+/6152c6d94ee3280b6f5ee6709b85514ee9542463 commit 6152c6d94ee3280b6f5ee6709b85514ee9542463 Author: Kenneth Russell <kbr@chromium.org> Date: Mon Feb 06 06:40:41 2017 Rename incorrectly-named Mac GPU bots. Many of these bots included a now-incorrect OS version in their names. Remove it and clarify some of the other bots' names. While this renaming will lose build history, these bots have been green for a while, so now is as good a time as any to rename them. This depends on the Chromium-side patch https://codereview.chromium.org/2679543002 which provides buildbot JSON files for the new machine names. BUG= 688887 TBR=dpranke@chromium.org,phajdan.jr@chromium.org Change-Id: Icdb831c17750cdd5b937190e1e283e82f0be3065 Change-Id: Icdb831c17750cdd5b937190e1e283e82f0be3065 Reviewed-on: https://chromium-review.googlesource.com/437616 Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org> [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_GPU_Mac_Builder.json [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Optional_Mac_Release__Intel_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipe_modules/chromium_tests/chromium_gpu.py [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_Mac_Retina_Debug__AMD_.json [delete] https://crrev.com/d11b3bee99abb640af2bf2cf80e15894fd7f26c6/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_10_10_Retina_Release__AMD_.json [copy] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_Mac_Retina_Release__AMD_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium_trybot.py [copy] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Debug__Intel_.json [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Retina_Release__NVIDIA_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium_trybot.expected/dont_deapply_patch.json [copy] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Optional_Mac_Retina_Release__NVIDIA_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Retina_Debug__AMD_.json [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Experimental_Retina_Release__AMD_.json [delete] https://crrev.com/d11b3bee99abb640af2bf2cf80e15894fd7f26c6/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_10_11_Retina_Release__AMD_.json [copy] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Release__Intel_.json [copy] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Optional_Mac_Retina_Release__AMD_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipe_modules/chromium_tests/trybots.py [delete] https://crrev.com/d11b3bee99abb640af2bf2cf80e15894fd7f26c6/scripts/slave/recipes/chromium.expected/full_chromium_gpu_Mac_10_10_Retina_Release__AMD_.json [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_Mac_Debug__Intel_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_GPU_Mac_Builder__dbg_.json [copy] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Pro_Debug__AMD_.json [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_Mac_Release__Intel_.json [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Pro_Release__AMD_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/masters/master.chromium.gpu.fyi/builders.pyl [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Retina_Debug__NVIDIA_.json [delete] https://crrev.com/d11b3bee99abb640af2bf2cf80e15894fd7f26c6/scripts/slave/recipes/chromium.expected/full_chromium_gpu_Mac_10_10_Retina_Debug__AMD_.json [rename] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Retina_Release__AMD_.json [delete] https://crrev.com/d11b3bee99abb640af2bf2cf80e15894fd7f26c6/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Optional_Mac_10_10_Release__Intel_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/masters/master.chromium.gpu/builders.pyl [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Mac_Builder.json [delete] https://crrev.com/d11b3bee99abb640af2bf2cf80e15894fd7f26c6/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Optional_Mac_10_10_Retina_Release__AMD_.json [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/tests/masters_recipes_test.py [modify] https://crrev.com/6152c6d94ee3280b6f5ee6709b85514ee9542463/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_GPU_Mac_Builder__dbg_.json
The following revision refers to this bug: https://chrome-internal.googlesource.com/infradata/master-manager/+/5e1adbcc17eef554cd61d17ba045fdf1cd57a247 commit 5e1adbcc17eef554cd61d17ba045fdf1cd57a247 Author: Kenneth Russell <kbr@chromium.org> Date: Mon Feb 06 06:51:43 2017
The following revision refers to this bug: https://chrome-internal.googlesource.com/infradata/master-manager/+/aafd86343a8b5b64d5008461d36ce24b4bd36aa2 commit aafd86343a8b5b64d5008461d36ce24b4bd36aa2 Author: Kenneth Russell <kbr@chromium.org> Date: Mon Feb 06 06:52:35 2017
Sorry, one more CL incoming.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/6a163bb66c3eac5bdaacd40c22b49f6f8dd28b17 commit 6a163bb66c3eac5bdaacd40c22b49f6f8dd28b17 Author: kbr <kbr@chromium.org> Date: Wed Feb 08 05:00:21 2017 Remove obsolete Mac bots from generate_buildbot_json.py. BUG= 688887 CQ_INCLUDE_TRYBOTS=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;master.tryserver.chromium.android:android_optional_gpu_tests_rel TBR=zmo@chromium.org Review-Url: https://codereview.chromium.org/2683963002 Cr-Commit-Position: refs/heads/master@{#448909} [modify] https://crrev.com/6a163bb66c3eac5bdaacd40c22b49f6f8dd28b17/content/test/gpu/generate_buildbot_json.py [modify] https://crrev.com/6a163bb66c3eac5bdaacd40c22b49f6f8dd28b17/testing/buildbot/chromium.gpu.fyi.json [modify] https://crrev.com/6a163bb66c3eac5bdaacd40c22b49f6f8dd28b17/testing/buildbot/chromium.gpu.json
Comment 1 by bugdroid1@chromium.org
, Feb 6 2017