Add O/S versions to all bot names, change "Webkit" to "WebKit" in all bot names.

Add O/S versions to all bot names, change "Webkit" to "WebKit" in all bot names.

BUG=154326
R=nsylvain@chromium.org, ojan@chromium.org

[Dirk Pranke, 2012-10-12 21:07:22]

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
File masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py (left):

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py:41: rel_archive =
master_config.GetArchiveUrl('ChromiumWebkit',
I'm leaving this as 'ChromiumWebkit' since (a) I don't think this is a
user-visible name anywhere and, more importantly, (b) I don't know if just
changing this string everywhere is enough, and what breaks if I change it.

If nothing breaks and a search&replace is enough, it would probably be good to
change this to 'ChromiumWebKit' as well for consistency; then all uses of WebKit
would either be all lower-case or properly MixedCase. Thoughts?

[nsylvain, 2012-10-12 21:13:33]

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
File masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py (left):

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py:41: rel_archive =
master_config.GetArchiveUrl('ChromiumWebkit',
On 2012/10/12 21:07:22, Dirk Pranke wrote:
> I'm leaving this as 'ChromiumWebkit' since (a) I don't think this is a
> user-visible name anywhere and, more importantly, (b) I don't know if just
> changing this string everywhere is enough, and what breaks if I change it.
> 
> If nothing breaks and a search&replace is enough, it would probably be good to
> change this to 'ChromiumWebKit' as well for consistency; then all uses of
WebKit
> would either be all lower-case or properly MixedCase. Thoughts?

If you change it you also need to change it everywhere in slaves.cfg and in
site_config/config_default.py and build_internal/site_config/config_private.py.

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
File masters/master.chromium.webkit/slaves.cfg (right):

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
masters/master.chromium.webkit/slaves.cfg:69: 'builder': 'WebKit WinXP',
WinXP or XP ?

[Dirk Pranke, 2012-10-12 21:46:09]

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
File masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py (left):

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py:41: rel_archive =
master_config.GetArchiveUrl('ChromiumWebkit',
On 2012/10/12 21:13:33, nsylvain wrote:
> On 2012/10/12 21:07:22, Dirk Pranke wrote:
> > I'm leaving this as 'ChromiumWebkit' since (a) I don't think this is a
> > user-visible name anywhere and, more importantly, (b) I don't know if just
> > changing this string everywhere is enough, and what breaks if I change it.
> > 
> > If nothing breaks and a search&replace is enough, it would probably be good
to
> > change this to 'ChromiumWebKit' as well for consistency; then all uses of
> WebKit
> > would either be all lower-case or properly MixedCase. Thoughts?
> 
> If you change it you also need to change it everywhere in slaves.cfg and in
> site_config/config_default.py and
build_internal/site_config/config_private.py. 

Okay, I'll leave this as-is for now.

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
File masters/master.chromium.webkit/slaves.cfg (right):

https://codereview.chromium.org/11139002/diff/1/masters/master.chromium.webki...
masters/master.chromium.webkit/slaves.cfg:69: 'builder': 'WebKit WinXP',
On 2012/10/12 21:13:33, nsylvain wrote:
> WinXP or XP ? 

Whoops, should be just "XP".

[nsylvain, 2012-10-12 21:48:39]

lgtm

[commit-bot: I haz the power, 2012-10-12 23:14:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dpranke@chromium.org/11139002/5001

[commit-bot: I haz the power, 2012-10-12 23:14:43]

Failed to apply patch for build/masters/master.chromium.webkit/slaves.cfg:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/masters/master.chromium.webkit/slaves.cfg
  Hunk #6 FAILED at 82.
  Hunk #7 FAILED at 90.
  Hunk #11 succeeded at 141 (offset 8 lines).
  Hunk #12 succeeded at 149 (offset 8 lines).
  Hunk #13 succeeded at 157 (offset 8 lines).
  Hunk #14 succeeded at 176 (offset 8 lines).
  Hunk #15 succeeded at 184 (offset 8 lines).
  Hunk #16 succeeded at 192 (offset 8 lines).
  Hunk #17 succeeded at 211 (offset 8 lines).
  Hunk #18 succeeded at 286 (offset 16 lines).
  Hunk #19 succeeded at 294 (offset 16 lines).
  Hunk #20 succeeded at 373 (offset 16 lines).
  Hunk #21 succeeded at 391 (offset 16 lines).
  2 out of 21 hunks FAILED -- saving rejects to file
build/masters/master.chromium.webkit/slaves.cfg.rej

Patch:       build/masters/master.chromium.webkit/slaves.cfg
Index: masters/master.chromium.webkit/slaves.cfg
diff --git build/masters/master.chromium.webkit/slaves.cfg
build/masters/master.chromium.webkit/slaves.cfg
index
426f86ef8fef83e1ea2c061380b34ffbc74dca94..e749d8c4630bbc282c3a531327e3d83e130bc991
100644
--- a/build/masters/master.chromium.webkit/slaves.cfg
+++ b/build/masters/master.chromium.webkit/slaves.cfg
@@ -4,11 +4,11 @@
 
 slaves = [

################################################################################
-### Webkit Win Deps
+### WebKit Win Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win Builder (deps)',
+    'builder': 'WebKit Win Builder (deps)',
     'hostname': 'build19-m1',
     'os': 'win',
     'version': '2008',
@@ -16,18 +16,18 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (deps)',
+    'builder': 'WebKit XP (deps)',
     'hostname': 'vm112-m1',
     'os': 'win',
     'version': 'xp',
     'bits': '32',
   },

################################################################################
-### Webkit Mac Deps
+### WebKit Mac Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder (deps)',
+    'builder': 'WebKit Mac Builder (deps)',
     'hostname': 'vm641-m1',
     'os': 'mac',
     'version': '10.6',
@@ -35,30 +35,30 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6 (deps)',
+    'builder': 'WebKit Mac10.6 (deps)',
     'hostname': 'vm642-m1',
     'os': 'mac',
     'version': '10.6',
     'bits': '64'
   },

################################################################################
-### Webkit Linux Deps
+### WebKit Linux Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux (deps)',
+    'builder': 'WebKit Linux (deps)',
     'hostname': 'vm37-m1',
     'os': 'linux',
     'version': 'lucid',
     'bits': '64',
   },

################################################################################
-### Webkit Win Latest
+### WebKit Win Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': ['Webkit Win Builder',
-                'Webkit Win Builder (dbg)'],
+    'builder': ['WebKit Win Builder',
+                'WebKit Win Builder (dbg)'],
     'hostname': 'build20-m1',
     'os': 'win',
     'version': '2008',
@@ -66,7 +66,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win',
+    'builder': 'WebKit XP',
     'hostname': 'vm33-m1',
     'os': 'win',
     'version': 'xp',
@@ -74,7 +74,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win7',
+    'builder': 'WebKit Win7',
     'hostname': 'vm49-m1',
     'os': 'win',
     'version': 'win7',
@@ -82,7 +82,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (dbg)(1)',
+    'builder': 'WebKit Win (dbg)(1)',
     'hostname': 'vm467-m1',
     'os': 'win',
     'version': 'win7',
@@ -90,7 +90,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (dbg)(2)',
+    'builder': 'WebKit Win (dbg)(2)',
     'hostname': 'vm499-m1',
     'os': 'win',
     'version': 'win7',
@@ -105,11 +105,11 @@ slaves = [
     'bits': '64',
   },

################################################################################
-### Webkit Mac Latest
+### WebKit Mac Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder',
+    'builder': 'WebKit Mac Builder',
     'hostname': 'vm601-m1',
     'os': 'mac',
     'version': '10.6',
@@ -117,7 +117,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6',
+    'builder': 'WebKit Mac10.6',
     'hostname': 'vm623-m1',
     'os': 'mac',
     'version': '10.6',
@@ -125,7 +125,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.7',
+    'builder': 'WebKit Mac10.7',
     'hostname': 'mini61-m1',
     'os': 'mac',
     'version': '10.7',
@@ -133,7 +133,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder (dbg)',
+    'builder': 'WebKit Mac Builder (dbg)',
     'hostname': 'vm610-m1',
     'os': 'mac',
     'version': '10.6',
@@ -141,7 +141,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.7 (dbg)',
+    'builder': 'WebKit Mac10.7 (dbg)',
     'hostname': 'vm619-m1',
     'os': 'mac',
     'version': '10.7',
@@ -149,18 +149,18 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6 (dbg)',
+    'builder': 'WebKit Mac10.6 (dbg)',
     'hostname': 'vm626-m1',
     'os': 'mac',
     'version': '10.6',
     'bits': '64'
   },

################################################################################
-### Webkit Linux Latest
+### WebKit Linux Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux',
+    'builder': 'WebKit Linux',
     'hostname': 'vm124-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -168,7 +168,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux ASAN',
+    'builder': 'WebKit Linux ASAN',
     'hostname': 'vm177-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -176,7 +176,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux 32',
+    'builder': 'WebKit Linux 32',
     'hostname': 'vm454-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -184,7 +184,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux (dbg)',
+    'builder': 'WebKit Linux (dbg)',
     'hostname': 'build63-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -203,7 +203,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Win (dbg)',
+    'builder': 'Win7 (dbg)',
     'hostname': 'vm189-m1',
     'os': 'win',
     'version': 'win7',
@@ -270,7 +270,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'GPU Mac',
+    'builder': 'GPU Mac10.7',
     'hostname': 'mini70-m1',
     'os': 'mac',
     'version': '10.7',
@@ -278,7 +278,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'GPU Mac (dbg)',
+    'builder': 'GPU Mac10.7 (dbg)',
     'hostname': 'mini64-m1',
     'os': 'mac',
     'version': '10.7',
@@ -357,7 +357,7 @@ slaves = [
   {
     'master': 'ChromiumWebkit',
     'hostname': 'chromeperf62',
-    'builder': 'Webkit Android Tests (GalaxyNexus)',
+    'builder': 'WebKit Android Tests (GalaxyNexus)',
     'os': 'linux',
     'version': 'lucid',
     'bits': '64',
@@ -375,7 +375,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'WebKit (Content Shell) Mac',
+    'builder': 'WebKit (Content Shell) Mac10.6',
     'hostname': 'vm647-m1',
     'os': 'mac',
     'version': '10.6',

[commit-bot: I haz the power, 2012-10-12 23:26:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dpranke@chromium.org/11139002/12001

[commit-bot: I haz the power, 2012-10-12 23:27:08]

Failed to apply patch for build/masters/master.chromium.webkit/slaves.cfg:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/masters/master.chromium.webkit/slaves.cfg
  Hunk #6 FAILED at 82.
  Hunk #7 FAILED at 90.
  2 out of 22 hunks FAILED -- saving rejects to file
build/masters/master.chromium.webkit/slaves.cfg.rej

Patch:       build/masters/master.chromium.webkit/slaves.cfg
Index: masters/master.chromium.webkit/slaves.cfg
diff --git build/masters/master.chromium.webkit/slaves.cfg
build/masters/master.chromium.webkit/slaves.cfg
index
ab515e0be42c639e3a6a533043f3842fc50796c9..26e031e5dfc99a557f446553236d9b7c4efd450a
100644
--- a/build/masters/master.chromium.webkit/slaves.cfg
+++ b/build/masters/master.chromium.webkit/slaves.cfg
@@ -4,11 +4,11 @@
 
 slaves = [

################################################################################
-### Webkit Win Deps
+### WebKit Win Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win Builder (deps)',
+    'builder': 'WebKit Win Builder (deps)',
     'hostname': 'build19-m1',
     'os': 'win',
     'version': '2008',
@@ -16,18 +16,18 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (deps)',
+    'builder': 'WebKit XP (deps)',
     'hostname': 'vm112-m1',
     'os': 'win',
     'version': 'xp',
     'bits': '32',
   },

################################################################################
-### Webkit Mac Deps
+### WebKit Mac Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder (deps)',
+    'builder': 'WebKit Mac Builder (deps)',
     'hostname': 'vm641-m1',
     'os': 'mac',
     'version': '10.6',
@@ -35,30 +35,30 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6 (deps)',
+    'builder': 'WebKit Mac10.6 (deps)',
     'hostname': 'vm642-m1',
     'os': 'mac',
     'version': '10.6',
     'bits': '64'
   },

################################################################################
-### Webkit Linux Deps
+### WebKit Linux Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux (deps)',
+    'builder': 'WebKit Linux (deps)',
     'hostname': 'vm37-m1',
     'os': 'linux',
     'version': 'lucid',
     'bits': '64',
   },

################################################################################
-### Webkit Win Latest
+### WebKit Win Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': ['Webkit Win Builder',
-                'Webkit Win Builder (dbg)'],
+    'builder': ['WebKit Win Builder',
+                'WebKit Win Builder (dbg)'],
     'hostname': 'build20-m1',
     'os': 'win',
     'version': '2008',
@@ -66,7 +66,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win',
+    'builder': 'WebKit XP',
     'hostname': 'vm33-m1',
     'os': 'win',
     'version': 'xp',
@@ -74,7 +74,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win7',
+    'builder': 'WebKit Win7',
     'hostname': 'vm49-m1',
     'os': 'win',
     'version': 'win7',
@@ -82,7 +82,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (dbg)(1)',
+    'builder': 'WebKit Win (dbg)(1)',
     'hostname': 'vm103-m1',
     'os': 'win',
     'version': 'xp',
@@ -90,7 +90,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (dbg)(2)',
+    'builder': 'WebKit Win (dbg)(2)',
     'hostname': 'vm115-m1',
     'os': 'win',
     'version': 'xp',
@@ -105,11 +105,11 @@ slaves = [
     'bits': '64',
   },

################################################################################
-### Webkit Mac Latest
+### WebKit Mac Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder',
+    'builder': 'WebKit Mac Builder',
     'hostname': 'vm601-m1',
     'os': 'mac',
     'version': '10.6',
@@ -117,7 +117,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6',
+    'builder': 'WebKit Mac10.6',
     'hostname': 'vm623-m1',
     'os': 'mac',
     'version': '10.6',
@@ -125,7 +125,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.7',
+    'builder': 'WebKit Mac10.7',
     'hostname': 'mini61-m1',
     'os': 'mac',
     'version': '10.7',
@@ -133,7 +133,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.8',
+    'builder': 'WebKit Mac10.8',
     'hostname': 'vm655-m1',
     'os': 'mac',
     'version': '10.8',
@@ -141,7 +141,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder (dbg)',
+    'builder': 'WebKit Mac Builder (dbg)',
     'hostname': 'vm610-m1',
     'os': 'mac',
     'version': '10.6',
@@ -149,7 +149,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.7 (dbg)',
+    'builder': 'WebKit Mac10.7 (dbg)',
     'hostname': 'vm619-m1',
     'os': 'mac',
     'version': '10.7',
@@ -157,18 +157,18 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6 (dbg)',
+    'builder': 'WebKit Mac10.6 (dbg)',
     'hostname': 'vm626-m1',
     'os': 'mac',
     'version': '10.6',
     'bits': '64'
   },

################################################################################
-### Webkit Linux Latest
+### WebKit Linux Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux',
+    'builder': 'WebKit Linux',
     'hostname': 'vm124-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -176,7 +176,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux ASAN',
+    'builder': 'WebKit Linux ASAN',
     'hostname': 'vm177-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -184,7 +184,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux 32',
+    'builder': 'WebKit Linux 32',
     'hostname': 'vm454-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -192,7 +192,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux (dbg)',
+    'builder': 'WebKit Linux (dbg)',
     'hostname': 'build63-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -211,7 +211,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Win (dbg)',
+    'builder': 'Win7 (dbg)',
     'hostname': 'vm189-m1',
     'os': 'win',
     'version': 'win7',
@@ -286,7 +286,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'GPU Mac',
+    'builder': 'GPU Mac10.7',
     'hostname': 'mini70-m1',
     'os': 'mac',
     'version': '10.7',
@@ -294,7 +294,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'GPU Mac (dbg)',
+    'builder': 'GPU Mac10.7 (dbg)',
     'hostname': 'mini64-m1',
     'os': 'mac',
     'version': '10.7',
@@ -373,7 +373,7 @@ slaves = [
   {
     'master': 'ChromiumWebkit',
     'hostname': 'chromeperf62',
-    'builder': 'Webkit Android Tests (GalaxyNexus)',
+    'builder': 'WebKit Android Tests (GalaxyNexus)',
     'os': 'linux',
     'version': 'lucid',
     'bits': '64',
@@ -391,7 +391,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'WebKit (Content Shell) Mac',
+    'builder': 'WebKit (Content Shell) Mac10.6',
     'hostname': 'vm647-m1',
     'os': 'mac',
     'version': '10.6',

[commit-bot: I haz the power, 2012-10-12 23:31:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dpranke@chromium.org/11139002/5015

[commit-bot: I haz the power, 2012-10-12 23:31:18]

Failed to apply patch for build/masters/master.chromium.webkit/slaves.cfg:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/masters/master.chromium.webkit/slaves.cfg
  Hunk #6 FAILED at 82.
  1 out of 21 hunks FAILED -- saving rejects to file
build/masters/master.chromium.webkit/slaves.cfg.rej

Patch:       build/masters/master.chromium.webkit/slaves.cfg
Index: masters/master.chromium.webkit/slaves.cfg
diff --git build/masters/master.chromium.webkit/slaves.cfg
build/masters/master.chromium.webkit/slaves.cfg
index
ab515e0be42c639e3a6a533043f3842fc50796c9..223cc87813c5aeb9f716c29bb26c9ec0b2641c1a
100644
--- a/build/masters/master.chromium.webkit/slaves.cfg
+++ b/build/masters/master.chromium.webkit/slaves.cfg
@@ -4,11 +4,11 @@
 
 slaves = [

################################################################################
-### Webkit Win Deps
+### WebKit Win Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win Builder (deps)',
+    'builder': 'WebKit Win Builder (deps)',
     'hostname': 'build19-m1',
     'os': 'win',
     'version': '2008',
@@ -16,18 +16,18 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (deps)',
+    'builder': 'WebKit XP (deps)',
     'hostname': 'vm112-m1',
     'os': 'win',
     'version': 'xp',
     'bits': '32',
   },

################################################################################
-### Webkit Mac Deps
+### WebKit Mac Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder (deps)',
+    'builder': 'WebKit Mac Builder (deps)',
     'hostname': 'vm641-m1',
     'os': 'mac',
     'version': '10.6',
@@ -35,30 +35,30 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6 (deps)',
+    'builder': 'WebKit Mac10.6 (deps)',
     'hostname': 'vm642-m1',
     'os': 'mac',
     'version': '10.6',
     'bits': '64'
   },

################################################################################
-### Webkit Linux Deps
+### WebKit Linux Deps

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux (deps)',
+    'builder': 'WebKit Linux (deps)',
     'hostname': 'vm37-m1',
     'os': 'linux',
     'version': 'lucid',
     'bits': '64',
   },

################################################################################
-### Webkit Win Latest
+### WebKit Win Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': ['Webkit Win Builder',
-                'Webkit Win Builder (dbg)'],
+    'builder': ['WebKit Win Builder',
+                'WebKit Win Builder (dbg)'],
     'hostname': 'build20-m1',
     'os': 'win',
     'version': '2008',
@@ -66,7 +66,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win',
+    'builder': 'WebKit XP',
     'hostname': 'vm33-m1',
     'os': 'win',
     'version': 'xp',
@@ -74,7 +74,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win7',
+    'builder': 'WebKit Win7',
     'hostname': 'vm49-m1',
     'os': 'win',
     'version': 'win7',
@@ -82,16 +82,16 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (dbg)(1)',
-    'hostname': 'vm103-m1',
+    'builder': 'WebKit Win7 (dbg)(1)',
+    'hostname': 'vm467-m1',
     'os': 'win',
     'version': 'xp',
     'bits': '32',
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Win (dbg)(2)',
-    'hostname': 'vm115-m1',
+    'builder': 'WebKit Win7 (dbg)(2)',
+    'hostname': 'vm499-m1',
     'os': 'win',
     'version': 'xp',
     'bits': '32',
@@ -105,11 +105,11 @@ slaves = [
     'bits': '64',
   },

################################################################################
-### Webkit Mac Latest
+### WebKit Mac Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder',
+    'builder': 'WebKit Mac Builder',
     'hostname': 'vm601-m1',
     'os': 'mac',
     'version': '10.6',
@@ -117,7 +117,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6',
+    'builder': 'WebKit Mac10.6',
     'hostname': 'vm623-m1',
     'os': 'mac',
     'version': '10.6',
@@ -125,7 +125,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.7',
+    'builder': 'WebKit Mac10.7',
     'hostname': 'mini61-m1',
     'os': 'mac',
     'version': '10.7',
@@ -133,7 +133,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.8',
+    'builder': 'WebKit Mac10.8',
     'hostname': 'vm655-m1',
     'os': 'mac',
     'version': '10.8',
@@ -141,7 +141,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac Builder (dbg)',
+    'builder': 'WebKit Mac Builder (dbg)',
     'hostname': 'vm610-m1',
     'os': 'mac',
     'version': '10.6',
@@ -149,7 +149,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.7 (dbg)',
+    'builder': 'WebKit Mac10.7 (dbg)',
     'hostname': 'vm619-m1',
     'os': 'mac',
     'version': '10.7',
@@ -157,18 +157,18 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Mac10.6 (dbg)',
+    'builder': 'WebKit Mac10.6 (dbg)',
     'hostname': 'vm626-m1',
     'os': 'mac',
     'version': '10.6',
     'bits': '64'
   },

################################################################################
-### Webkit Linux Latest
+### WebKit Linux Latest

################################################################################
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux',
+    'builder': 'WebKit Linux',
     'hostname': 'vm124-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -176,7 +176,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux ASAN',
+    'builder': 'WebKit Linux ASAN',
     'hostname': 'vm177-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -184,7 +184,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux 32',
+    'builder': 'WebKit Linux 32',
     'hostname': 'vm454-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -192,7 +192,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Webkit Linux (dbg)',
+    'builder': 'WebKit Linux (dbg)',
     'hostname': 'build63-m1',
     'os': 'linux',
     'version': 'lucid',
@@ -211,7 +211,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'Win (dbg)',
+    'builder': 'Win7 (dbg)',
     'hostname': 'vm189-m1',
     'os': 'win',
     'version': 'win7',
@@ -286,7 +286,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'GPU Mac',
+    'builder': 'GPU Mac10.7',
     'hostname': 'mini70-m1',
     'os': 'mac',
     'version': '10.7',
@@ -294,7 +294,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'GPU Mac (dbg)',
+    'builder': 'GPU Mac10.7 (dbg)',
     'hostname': 'mini64-m1',
     'os': 'mac',
     'version': '10.7',
@@ -373,7 +373,7 @@ slaves = [
   {
     'master': 'ChromiumWebkit',
     'hostname': 'chromeperf62',
-    'builder': 'Webkit Android Tests (GalaxyNexus)',
+    'builder': 'WebKit Android Tests (GalaxyNexus)',
     'os': 'linux',
     'version': 'lucid',
     'bits': '64',
@@ -391,7 +391,7 @@ slaves = [
   },
   {
     'master': 'ChromiumWebkit',
-    'builder': 'WebKit (Content Shell) Mac',
+    'builder': 'WebKit (Content Shell) Mac10.6',
     'hostname': 'vm647-m1',
     'os': 'mac',
     'version': '10.6',

[ojan, 2012-10-12 23:46:12]

Looks like almost all the bots are 64 bit. Should we also call out all the 32bit
bots just to be extra clear?

https://chromiumcodereview.appspot.com/11139002/diff/5015/masters/master.chro...
File masters/master.chromium.webkit/slaves.cfg (right):

https://chromiumcodereview.appspot.com/11139002/diff/5015/masters/master.chro...
masters/master.chromium.webkit/slaves.cfg:19: 'builder': 'WebKit XP (deps)',
Should this have 32 in the name? Or 32bit?

https://chromiumcodereview.appspot.com/11139002/diff/5015/masters/master.chro...
masters/master.chromium.webkit/slaves.cfg:69: 'builder': 'WebKit XP',
Ditto.

https://chromiumcodereview.appspot.com/11139002/diff/5015/masters/master.chro...
masters/master.chromium.webkit/slaves.cfg:85: 'builder': 'WebKit Win7 (dbg)(1)',
Ditto.

https://chromiumcodereview.appspot.com/11139002/diff/5015/masters/master.chro...
masters/master.chromium.webkit/slaves.cfg:93: 'builder': 'WebKit Win7 (dbg)(2)',
Ditto

[Dirk Pranke, 2012-10-12 23:53:55]

On 2012/10/12 23:46:12, ojan wrote:
> Looks like almost all the bots are 64 bit. Should we also call out all the
32bit
> bots just to be extra clear?

I wouldn't bother; the only place where it matters for the layout tests is on
Linux, where we do call out 32 bit in the name. We just have to specify 32/64
for buildbot in the cfg file.