https://codereview.chromium.org/1892903002/ is the full change. Now that I look at it, I think this needs to be done in several phases:

1. Free up build29-m1 by reshuffling bots on the FYI waterfall, restart FYI master
2. Add WinClang bot to main waterfall on main waterfall, restart main master
3. Edit try config to point win_clang bot from FYI to main WinClang bot
4. Remove WinClang bot from FYI waterfall, restart FYI master

dpranke, does that sound right to you? (win8 gn probably went through something similar?)

Dirk suggests a better plan: Remove 1 and use vm817-m1 instead (and the swap the slave later if necessary).

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/build.git/+/90d451e1f43d0d6ff7a12283b745876db9fd458f

commit 90d451e1f43d0d6ff7a12283b745876db9fd458f
Author: thakis@chromium.org <thakis@chromium.org>
Date: Fri Apr 15 21:24:58 2016

Add a copy of the "WinClang64 (dbg)" bot to the main waterfall.

It's a copy of the WinClang FYI bot.

After this:
* restart main win waterfall master
* change win_clang trybot to point to this bot instead of the FYI bot
* remove bot from FYI waterfall

BUG= 603935 

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/build@299968 0039d316-1c4b-4281-b951-d872f2087c98

[modify] https://crrev.com/90d451e1f43d0d6ff7a12283b745876db9fd458f/masters/master.chromium.win/master_win_cfg.py
[modify] https://crrev.com/90d451e1f43d0d6ff7a12283b745876db9fd458f/masters/master.chromium.win/slaves.cfg
[modify] https://crrev.com/90d451e1f43d0d6ff7a12283b745876db9fd458f/scripts/slave/recipe_modules/chromium_tests/chromium_win.py
[modify] https://crrev.com/90d451e1f43d0d6ff7a12283b745876db9fd458f/scripts/slave/recipe_modules/chromium_tests/trybots.py
[add] https://crrev.com/90d451e1f43d0d6ff7a12283b745876db9fd458f/scripts/slave/recipes/chromium.expected/full_chromium_win_WinClang64__dbg_.json
[modify] https://crrev.com/90d451e1f43d0d6ff7a12283b745876db9fd458f/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang.json

Further modified plan: The cl in comment 3 also update the trybot already. dpranke pointed out that the .win bot doesn't have to be live for that to work, and the presubmit enforces that main waterfall bots have a matching try slave. (I missed to update the Cl description after changing that).

Left to do:
* restart main waterfall win master
* remove bot from FYI waterfall
* restart FYI waterfall

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infradata/master-manager.git/+/90ef356a4c1ce0d8cc32d2d800decad38fd26a1e

commit 90ef356a4c1ce0d8cc32d2d800decad38fd26a1e
Author: thakis <thakis@google.com>
Date: Fri Apr 15 21:38:50 2016

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

commit 45ba5ad730feb6e9caecb02226817fb077190d45
Author: Nico Weber <thakis@chromium.org>
Date: Fri Apr 15 22:19:18 2016

Add mb config for new WinClang64 (dbg) main waterfall bot.

BUG= 603935 
TBR=dpranke@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#387721}

[modify] https://crrev.com/45ba5ad730feb6e9caecb02226817fb077190d45/tools/mb/mb_config.pyl

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

commit 13165c5bd323cc94b9ba938ddfd8bcb8e0bf52d3
Author: Nico Weber <thakis@chromium.org>
Date: Fri Apr 15 22:32:48 2016

Move mb config for new WinClang64 (dbg) main waterfall bot to right place.

BUG= 603935 
TBR=dpranke

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

Cr-Commit-Position: refs/heads/master@{#387729}

[modify] https://crrev.com/13165c5bd323cc94b9ba938ddfd8bcb8e0bf52d3/tools/mb/mb_config.pyl

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/build.git/+/14ef197292d2cf15e081405bbcfb24a3fe856e88

commit 14ef197292d2cf15e081405bbcfb24a3fe856e88
Author: thakis@chromium.org <thakis@chromium.org>
Date: Sun Apr 17 02:29:52 2016

Remove WinClang bot from FYI waterfall.

It's now on the main waterfall as "WinClang64 (dbg)".

BUG= 603935 

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/build@299975 0039d316-1c4b-4281-b951-d872f2087c98

[modify] https://crrev.com/14ef197292d2cf15e081405bbcfb24a3fe856e88/masters/master.chromium.fyi/master.cfg
[modify] https://crrev.com/14ef197292d2cf15e081405bbcfb24a3fe856e88/masters/master.chromium.fyi/slaves.cfg
[modify] https://crrev.com/14ef197292d2cf15e081405bbcfb24a3fe856e88/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
[delete] https://crrev.com/0c03174efac10651d54dc521d3dd61c807c2b8cc/scripts/slave/recipes/chromium.expected/full_chromium_fyi_WinClang.json

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infradata/master-manager.git/+/a55a32268b420a91fe575bd0e5fb7b98956b657d

commit a55a32268b420a91fe575bd0e5fb7b98956b657d
Author: thakis <thakis@google.com>
Date: Sun Apr 17 02:33:56 2016

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

commit 1622a7bcfabc18669b4828cd510d47db784eb662
Author: Nico Weber <thakis@chromium.org>
Date: Sun Apr 17 03:49:51 2016

Remove WinClang bot from FYI waterfall, src/ part.

BUG= 603935 
TBR=dpranke@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#387829}

[modify] https://crrev.com/1622a7bcfabc18669b4828cd510d47db784eb662/tools/mb/mb_config.pyl