I'm planning on using bm56[1] and bm66 as designated rev2 masters for branches that use a mixed set of rev1 and rev2 build slaves. In order to avoid having to lock all build slaves to the appropriate buildbot masters, I am creating two new pools in slavealloc: * try-aws-us-west-2-rev2 (for bm56) * build-aws-us-west-2-rev2 (for bm66) rev2 slaves which are being used to build branches fully migrated to win64-rev2 (eg. project branches) will stay in their current pool(s). rev2 build slaves which are being used to build branches with mixed pools (currently 'try', 'inbound' next) will be allocated to one of the new pools. The reason for the separation is the buildbot-configs have logic to set the proper environment for mixed pools only on designated buildbot masters[2]. One drawback of using pools to control where rev2 build slaves attach (versus locking them to specific masters) is that non-rev2 build slaves will not attach to the designated masters, thus placing higher load on the remaining masters. Discussed in IRC with :callek and :armenzg and determined that the remaining masters can handle the extra load. Worst case, we can move some non-Windows build slaves to the new 'rev2' pool though it won't treat them differently. [1] Note: bm56 is already a rev2 master but has non-windows slaves attached to it as well. [2] http://hg.mozilla.org/build/buildbot-configs/file/311a1dd1bb26/mozilla/config.py#l2228

Entries created in buildslaves.pools table: mysql> insert into pools(name) values('try-aws-us-west-2-rev2'); Query OK, 1 row affected (0.00 sec) mysql> insert into pools(name) values('build-aws-us-west-2-rev2'); Query OK, 1 row affected (0.00 sec) bm56 and bm66 masters moved to the new pools. w64-ix-slave03 and w64-ix-slave110 build slaves moved to the new try pool.

Also required an entry for each new pool in the slave_passwords table.