Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (120954 => 120955)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-06-21 18:54:21 UTC (rev 120954)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-06-21 18:57:45 UTC (rev 120955)
@@ -29,7 +29,6 @@
{ "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-4", "platform": "gtk"},
{ "name": "szeged-linux-1", "platform": "qt-4.8"},
{ "name": "szeged-linux-2", "platform": "qt-4.8"},
@@ -140,7 +139,7 @@
{
"name": "GTK Linux 64-bit Release", "type": "BuildAndTest", "builddir": "gtk-linux-64-release",
"platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["gtk-linux-slave-2"], "triggers": ["gtk-linux-64-release-tests-wk2"]
+ "slavenames": ["gtk-linux-slave-2"]
},
{
"name": "GTK Linux 64-bit Debug", "type": "BuildAndTest", "builddir": "gtk-linux-64-debug",
@@ -148,11 +147,6 @@
"slavenames": ["gtk-linux-slave-3"]
},
{
- "name": "GTK Linux 64-bit Release WK2 (Tests)", "type": "TestWebKit2", "builddir": "gtk-linux-64-release-tests-wk2",
- "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["gtk-linux-slave-4"]
- },
- {
"name": "Qt Linux Release", "type": "BuildAndTest", "builddir": "qt-linux-release",
"platform": "qt-4.8", "configuration": "release", "architectures": ["i386"],
"slavenames": ["szeged-linux-1"]
@@ -340,9 +334,6 @@
},
{ "type": "Triggerable", "name": "chromium-linux-perf-tests",
"builderNames": ["Chromium Linux Release (Perf)"]
- },
- { "type": "Triggerable", "name": "gtk-linux-64-release-tests-wk2",
- "builderNames": ["GTK Linux 64-bit Release WK2 (Tests)"]
}
]
}
Modified: trunk/Tools/ChangeLog (120954 => 120955)
--- trunk/Tools/ChangeLog 2012-06-21 18:54:21 UTC (rev 120954)
+++ trunk/Tools/ChangeLog 2012-06-21 18:57:45 UTC (rev 120955)
@@ -1,3 +1,14 @@
+2012-06-21 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r120937.
+ http://trac.webkit.org/changeset/120937
+ https://bugs.webkit.org/show_bug.cgi?id=89679
+
+ This patch brought buildbot master down (Requested by svillar
+ on #webkit).
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+
2012-06-21 Martin Robinson <[email protected]>
[GTK] Combine WebKit API tests into fewer binaries