Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (121088 => 121089)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-06-23 07:18:00 UTC (rev 121088)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-06-23 07:49:49 UTC (rev 121089)
@@ -29,6 +29,7 @@
{ "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"},
@@ -139,6 +140,7 @@
{
"name": "GTK Linux 64-bit Release", "type": "BuildAndTest", "builddir": "gtk-linux-64-release",
"platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+ "triggers": ["gtk-linux-64-release-tests-wk2"],
"slavenames": ["gtk-linux-slave-2"]
},
{
@@ -147,6 +149,11 @@
"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"]
@@ -334,6 +341,9 @@
},
{ "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/BuildSlaveSupport/build.webkit.org-config/master.cfg (121088 => 121089)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-23 07:18:00 UTC (rev 121088)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-23 07:49:49 UTC (rev 121089)
@@ -729,7 +729,7 @@
class BuildAndTestFactory(Factory):
TestClass = RunWebKitTests
ExtractTestResultsClass = ExtractTestResults
- def __init__(self, platform, configuration, architectures, **kwargs):
+ def __init__(self, platform, configuration, architectures, triggers=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
if platform.startswith("chromium"):
self.addStep(CleanupChromiumCrashLogs)
@@ -754,6 +754,10 @@
self.addStep(RunGtkAPITests)
if platform.startswith("qt"):
self.addStep(RunQtAPITests)
+ if triggers:
+ self.addStep(ArchiveBuiltProduct)
+ self.addStep(UploadBuiltProduct)
+ self.addStep(trigger.Trigger, schedulerNames=triggers)
class BuildAndTestLeaksFactory(BuildAndTestFactory):
TestClass = RunWebKitLeakTests
Modified: trunk/Tools/ChangeLog (121088 => 121089)
--- trunk/Tools/ChangeLog 2012-06-23 07:18:00 UTC (rev 121088)
+++ trunk/Tools/ChangeLog 2012-06-23 07:49:49 UTC (rev 121089)
@@ -1,3 +1,21 @@
+2012-06-23 Sergio Villar Senin <[email protected]>
+
+ [GTK] Add a new webkit2 tests slave bot
+ https://bugs.webkit.org/show_bug.cgi?id=89336
+
+ Reviewed by Csaba Osztrogonác.
+
+ Slave configuration for a new GTK 64 bit release bot that will run
+ WebKit2 tests.
+
+ Also BuildAndTest now accepts the "triggers" parametter,
+ this means that apart from building and testing it can trigger
+ some other build/test sequences in other slaves.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (BuildAndTestFactory.__init__):
+
2012-06-23 Kwang Yul Seo <[email protected]>
Unreviewed. Update my email.
