Add a Mac Lion Performance bot.

https://bugs.webkit.org/show_bug.cgi?id=77765

Reviewed by Adam Roben.

This will update the master configuration in the following ways:
    Add a new performance slave (apple-xseve-11)
    Add a new Factory to download a build and run perf tests.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(DownloadAndPerfTestFactory):
(DownloadAndPerfTestFactory.__init__):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106703 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
index 8ef7c29685c7919387abf76e1dac3962e2623cc7..85fbfec95c7556e30c9ca6bb880322c8e8a271c3 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -21,6 +21,7 @@
                     { "name": "apple-xserve-2", "platform": "mac-lion" },
                     { "name": "apple-xserve-3", "platform": "mac-lion" },
                     { "name": "apple-xserve-10", "platform": "mac-lion" },
+                    { "name": "apple-xserve-11", "platform": "mac-lion" },
                     
                     { "name": "apple-windows-1", "platform": "win"},
                     { "name": "apple-windows-2", "platform": "win"},
@@ -110,7 +111,7 @@
                     },
                     { "name": "Lion Intel Release (Build)", "type": "Build", "builddir": "lion-intel-release",
                       "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
-                      "triggers": ["lion-intel-release-tests", "lion-intel-release-tests-wk2"],
+                      "triggers": ["lion-intel-release-tests", "lion-intel-release-tests-wk2", "lion-intel-release-perf"],
                       "slavenames": ["apple-xserve-3"]
                     },
                     { "name": "Lion Intel Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests",
@@ -129,6 +130,11 @@
                       "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["apple-macpro-6"]
                     },
+                    {
+                      "name": "Lion Intel Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "lion-release-perf-tests",
+                      "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
+                      "slavenames": ["apple-xserve-11"]
+                    },
                     {
                       "name": "Windows Release (Build)", "type": "Build", "builddir": "win-release",
                       "platform": "win", "configuration": "release", "architectures": ["i386"],
@@ -297,6 +303,9 @@
                     { "type": "Triggerable", "name": "lion-intel-release-tests-wk2",
                       "builderNames": ["Lion Intel Release (WebKit2 Tests)"]
                     },
+                    { "type": "Triggerable", "name": "lion-intel-release-perf",
+                      "builderNames": ["Lion Intel Release (Perf)"]
+                    },
                     { "type": "Triggerable", "name": "lion-intel-debug-tests",
                       "builderNames": ["Lion Intel Debug (Tests)"]
                     },

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index a4daa7aa86a876c8e5c6b2a2623025b18808715c..a1a01b2851afe41d84cd2577e0ae1ed7873856fe 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -775,6 +775,14 @@ class BuildAndPerfTestFactory(Factory):
         self.addStep(CompileWebKit)
         self.addStep(RunAndUploadPerfTests)
 
+class DownloadAndPerfTestFactory(Factory):
+    def __init__(self, platform, configuration, architectures, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
+        self.addStep(CreateWebKitBuildDirectory)
+        self.addStep(DownloadBuiltProduct)
+        self.addStep(ExtractBuiltProduct)
+        self.addStep(RunAndUploadPerfTests)
+
 class PlatformSpecificScheduler(AnyBranchScheduler):
     def __init__(self, platform, branch, **kwargs):
         self.platform = platform

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 912959a6fc23dba31efb236e6849df4ebbddcc61..e2e034ee4b7febab9632df700996cec384a8a5e3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2012-02-03  Lucas Forschler  <lforschler@apple.com>
+
+        Add a Mac Lion Performance bot.
+        https://bugs.webkit.org/show_bug.cgi?id=77765
+
+        Reviewed by Adam Roben.
+
+        This will update the master configuration in the following ways:
+            Add a new performance slave (apple-xseve-11)
+            Add a new Factory to download a build and run perf tests.
+            
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (DownloadAndPerfTestFactory):
+        (DownloadAndPerfTestFactory.__init__):
+
 2012-02-03  Dirk Pranke  <dpranke@chromium.org>
 
         Extra TestWebKitAPI.gyp/TestWebKitAPI.target.chromium.mk in repository