<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174534] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174534">174534</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-10-09 15:09:18 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Mac OS Yosemite webkit build infrastructure.
This patch adds 15 bots to our build.webkit.org configuration.
We are matching the current Mavericks machines 1:1.
This patch includes some minor spacing changes to the buildslaves section to make everything similar.
Reviewed by Matt Hanson.
* BuildSlaveSupport/build.webkit.org-config/config.json:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (174533 => 174534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json        2014-10-09 21:42:49 UTC (rev 174533)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json        2014-10-09 22:09:18 UTC (rev 174534)
</span><span class="lines">@@ -1,53 +1,69 @@
</span><span class="cx"> {
</span><span class="cx"> "slaves": [ { "name": "test-slave", "platform": "*" },
</span><span class="cx">
</span><del>- { "name": "apple-mac-121", "platform": "mac-mountainlion"},
- { "name": "apple-mac-122", "platform": "mac-mountainlion"},
- { "name": "apple-mac-123", "platform": "mac-mountainlion"},
- { "name": "apple-mac-127", "platform": "mac-mountainlion"},
- { "name": "apple-mini-201", "platform": "mac-mountainlion"},
- { "name": "apple-mini-202", "platform": "mac-mountainlion"},
- { "name": "apple-mini-203", "platform": "mac-mountainlion"},
- { "name": "apple-mini-204", "platform": "mac-mountainlion"},
- { "name": "apple-mini-205", "platform": "mac-mountainlion"},
- { "name": "apple-mini-206", "platform": "mac-mountainlion"},
- { "name": "apple-mini-207", "platform": "mac-mountainlion"},
- { "name": "apple-mini-208", "platform": "mac-mountainlion"},
- { "name": "apple-mini-209", "platform": "mac-mountainlion"},
- { "name": "apple-mini-210", "platform": "mac-mountainlion"},
- { "name": "apple-mini-218", "platform": "mac-mountainlion"},
</del><ins>+ { "name": "apple-mac-121", "platform": "mac-mountainlion" },
+ { "name": "apple-mac-122", "platform": "mac-mountainlion" },
+ { "name": "apple-mac-123", "platform": "mac-mountainlion" },
+ { "name": "apple-mac-127", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-201", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-202", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-203", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-204", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-205", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-206", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-207", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-208", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-209", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-210", "platform": "mac-mountainlion" },
+ { "name": "apple-mini-218", "platform": "mac-mountainlion" },
</ins><span class="cx">
</span><del>- { "name": "apple-mac-114", "platform": "mac-mavericks"},
</del><ins>+ { "name": "apple-mac-114", "platform": "mac-mavericks" },
</ins><span class="cx"> { "name": "apple-mac-124", "platform": "mac-mavericks" },
</span><span class="cx"> { "name": "apple-mac-125", "platform": "mac-mavericks" },
</span><span class="cx"> { "name": "apple-mac-126", "platform": "mac-mavericks" },
</span><del>- { "name": "apple-mini-129", "platform": "mac-mavericks"},
- { "name": "apple-mini-130", "platform": "mac-mavericks"},
- { "name": "apple-mini-137", "platform": "mac-mavericks"},
- { "name": "apple-mini-138", "platform": "mac-mavericks"},
- { "name": "apple-mini-142", "platform": "mac-mavericks"},
- { "name": "apple-mini-178", "platform": "mac-mavericks"},
- { "name": "apple-mini-179", "platform": "mac-mavericks"},
- { "name": "apple-mini-180", "platform": "mac-mavericks"},
</del><ins>+ { "name": "apple-mini-129", "platform": "mac-mavericks" },
+ { "name": "apple-mini-130", "platform": "mac-mavericks" },
+ { "name": "apple-mini-137", "platform": "mac-mavericks" },
+ { "name": "apple-mini-138", "platform": "mac-mavericks" },
+ { "name": "apple-mini-142", "platform": "mac-mavericks" },
+ { "name": "apple-mini-178", "platform": "mac-mavericks" },
+ { "name": "apple-mini-179", "platform": "mac-mavericks" },
+ { "name": "apple-mini-180", "platform": "mac-mavericks" },
</ins><span class="cx"> { "name": "apple-mini-211", "platform": "mac-mavericks" },
</span><span class="cx"> { "name": "apple-mini-212", "platform": "mac-mavericks" },
</span><span class="cx"> { "name": "apple-mini-213", "platform": "mac-mavericks" },
</span><del>-
- { "name": "apple-windows-1", "platform": "win"},
- { "name": "apple-windows-2", "platform": "win"},
- { "name": "apple-windows-3", "platform": "win"},
- { "name": "apple-windows-4", "platform": "win"},
- { "name": "apple-windows-5", "platform": "win"},
- { "name": "apple-windows-6", "platform": "win"},
</del><span class="cx">
</span><del>- { "name": "gtk-linux-slave-1", "platform": "gtk"},
- { "name": "gtk-linux-slave-2", "platform": "gtk"},
- { "name": "gtk-linux-slave-3", "platform": "gtk"},
- { "name": "gtk-linux-slave-5", "platform": "gtk"},
- { "name": "gtk-linux-slave-6", "platform": "gtk"},
- { "name": "gtk-linux-slave-7", "platform": "gtk"},
- { "name": "gtk-linux-slave-8", "platform": "gtk"},
</del><ins>+ { "name": "apple-bot-133", "platform": "mac-yosemite" },
+ { "name": "apple-bot-134", "platform": "mac-yosemite" },
+ { "name": "apple-bot-135", "platform": "mac-yosemite" },
+ { "name": "apple-bot-136", "platform": "mac-yosemite" },
+ { "name": "apple-bot-137", "platform": "mac-yosemite" },
+ { "name": "apple-bot-138", "platform": "mac-yosemite" },
+ { "name": "apple-bot-139", "platform": "mac-yosemite" },
+ { "name": "apple-bot-140", "platform": "mac-yosemite" },
+ { "name": "apple-bot-141", "platform": "mac-yosemite" },
+ { "name": "apple-bot-142", "platform": "mac-yosemite" },
+ { "name": "apple-bot-143", "platform": "mac-yosemite" },
+ { "name": "apple-bot-144", "platform": "mac-yosemite" },
+ { "name": "apple-bot-145", "platform": "mac-yosemite" },
+ { "name": "apple-bot-146", "platform": "mac-yosemite" },
+ { "name": "apple-bot-147", "platform": "mac-yosemite" },
</ins><span class="cx">
</span><ins>+ { "name": "apple-windows-1", "platform": "win" },
+ { "name": "apple-windows-2", "platform": "win" },
+ { "name": "apple-windows-3", "platform": "win" },
+ { "name": "apple-windows-4", "platform": "win" },
+ { "name": "apple-windows-5", "platform": "win" },
+ { "name": "apple-windows-6", "platform": "win" },
+
+ { "name": "gtk-linux-slave-1", "platform": "gtk" },
+ { "name": "gtk-linux-slave-2", "platform": "gtk" },
+ { "name": "gtk-linux-slave-3", "platform": "gtk" },
+ { "name": "gtk-linux-slave-5", "platform": "gtk" },
+ { "name": "gtk-linux-slave-6", "platform": "gtk" },
+ { "name": "gtk-linux-slave-7", "platform": "gtk" },
+ { "name": "gtk-linux-slave-8", "platform": "gtk" },
+
</ins><span class="cx"> { "name": "wincairo-1", "platform": "wincairo" },
</span><span class="cx">
</span><span class="cx"> { "name": "efl-linux-slave-2", "platform": "efl" },
</span><span class="lines">@@ -92,6 +108,11 @@
</span><span class="cx"> "platform": "mac-mountainlion", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["apple-mac-123", "apple-mini-209"]
</span><span class="cx"> },
</span><ins>+ {
+ "name": "Apple MountainLion Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "mountainlion-release-perf-tests",
+ "platform": "mac-mountainlion", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["apple-mini-210"]
+ },
</ins><span class="cx"> { "name": "Apple Mavericks Debug (Build)", "type": "Build", "builddir": "mavericks-debug",
</span><span class="cx"> "platform": "mac-mavericks", "configuration": "debug", "architectures": ["x86_64"],
</span><span class="cx"> "triggers": ["mavericks-debug-tests-wk1", "mavericks-debug-tests-wk2"],
</span><span class="lines">@@ -132,10 +153,45 @@
</span><span class="cx"> "platform": "mac-mavericks", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["apple-mini-213"]
</span><span class="cx"> },
</span><ins>+ { "name": "Apple Yosemite Debug (Build)", "type": "Build", "builddir": "yosemite-debug",
+ "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
+ "triggers": ["yosemite-debug-tests-wk1", "yosemite-debug-tests-wk2"],
+ "slavenames": ["apple-bot-133", "apple-bot-134"]
+ },
+ { "name": "Apple Yosemite Debug WK1 (Tests)", "type": "Test", "builddir": "yosemite-debug-tests-wk1",
+ "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["apple-bot-135", "apple-bot-136"]
+ },
+ { "name": "Apple Yosemite Debug WK2 (Tests)", "type": "TestWebKit2", "builddir": "yosemite-debug-tests-wk2",
+ "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["apple-bot-137", "apple-bot-138"]
+ },
+ { "name": "Apple Yosemite LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "yosemite-cloop-debug",
+ "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["apple-bot-139"]
+ },
+ { "name": "Apple Yosemite 32-bit JSC (BuildAndTest)", "type": "BuildAndTest32bitJSC", "builddir": "yosemite-32bitJSC-debug",
+ "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["apple-bot-140"]
+ },
+ { "name": "Apple Yosemite Release (Build)", "type": "Build", "builddir": "yosemite-release",
+ "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
+ "triggers": ["yosemite-release-tests-wk1", "yosemite-release-tests-wk2", "yosemite-release-perf"],
+ "slavenames": ["apple-bot-141", "apple-bot-142"]
+ },
+ { "name": "Apple Yosemite Release WK1 (Tests)", "type": "Test", "builddir": "yosemite-release-tests-wk1",
+ "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
+ "additionalArguments": ["--no-retry-failures"],
+ "slavenames": ["apple-bot-143", "apple-bot-144"]
+ },
+ { "name": "Apple Yosemite Release WK2 (Tests)", "type": "TestWebKit2", "builddir": "yosemite-release-tests-wk2",
+ "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["apple-bot-145", "apple-bot-146"]
+ },
</ins><span class="cx"> {
</span><del>- "name": "Apple MountainLion Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "mountainlion-release-perf-tests",
- "platform": "mac-mountainlion", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["apple-mini-210"]
</del><ins>+ "name": "Apple Yosemite Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "yosemite-release-perf-tests",
+ "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["apple-bot-147"]
</ins><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "Apple Win Release (Build)", "type": "Build", "builddir": "win-release",
</span><span class="lines">@@ -238,6 +294,9 @@
</span><span class="cx"> { "type": "PlatformSpecificScheduler", "platform": "mac-mavericks", "branch": "trunk", "treeStableTimer": 45.0,
</span><span class="cx"> "builderNames": ["Apple Mavericks Release (Build)", "Apple Mavericks Debug (Build)", "Apple Mavericks LLINT CLoop (BuildAndTest)", "Apple Mavericks 32-bit JSC (BuildAndTest)"]
</span><span class="cx"> },
</span><ins>+ { "type": "PlatformSpecificScheduler", "platform": "mac-yosemite", "branch": "trunk", "treeStableTimer": 45.0,
+ "builderNames": ["Apple Yosemite Release (Build)", "Apple Yosemite Debug (Build)", "Apple Yosemite LLINT CLoop (BuildAndTest)", "Apple Yosemite 32-bit JSC (BuildAndTest)"]
+ },
</ins><span class="cx"> { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
</span><span class="cx"> "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
</span><span class="cx"> },
</span><span class="lines">@@ -274,6 +333,21 @@
</span><span class="cx"> { "type": "Triggerable", "name": "mavericks-release-perf",
</span><span class="cx"> "builderNames": ["Apple Mavericks Release (Perf)"]
</span><span class="cx"> },
</span><ins>+ { "type": "Triggerable", "name": "yosemite-release-tests-wk1",
+ "builderNames": ["Apple Yosemite Release WK1 (Tests)"]
+ },
+ { "type": "Triggerable", "name": "yosemite-release-tests-wk2",
+ "builderNames": ["Apple Yosemite Release WK2 (Tests)"]
+ },
+ { "type": "Triggerable", "name": "yosemite-debug-tests-wk1",
+ "builderNames": ["Apple Yosemite Debug WK1 (Tests)"]
+ },
+ { "type": "Triggerable", "name": "yosemite-debug-tests-wk2",
+ "builderNames": ["Apple Yosemite Debug WK2 (Tests)"]
+ },
+ { "type": "Triggerable", "name": "yosemite-release-perf",
+ "builderNames": ["Apple Yosemite Release (Perf)"]
+ },
</ins><span class="cx"> { "type": "Triggerable", "name": "win-release-tests",
</span><span class="cx"> "builderNames": ["Apple Win 7 Release (Tests)"]
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174533 => 174534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-10-09 21:42:49 UTC (rev 174533)
+++ trunk/Tools/ChangeLog        2014-10-09 22:09:18 UTC (rev 174534)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-09 Lucas Forschler <lforschler@apple.com>
+
+ Add Mac OS Yosemite webkit build infrastructure.
+
+ This patch adds 15 bots to our build.webkit.org configuration.
+ We are matching the current Mavericks machines 1:1.
+
+ This patch includes some minor spacing changes to the buildslaves section to make everything similar.
+
+ Reviewed by Matt Hanson.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+
</ins><span class="cx"> 2014-10-09 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't use backticks when running commands, as we run into sh-related
</span></span></pre>
</div>
</div>
</body>
</html>