Revert many of the hacks that aren't necessary since we updated buildbot past 0.7.11.

master.tryserver.webkit/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # These modules come from scripts/master, which must be in the PYTHONPATH.
 # TODO(maruel): Upstream these to make it webkit.org-friendly.
 from builders_pools import BuildersPools
 from try_job_http import TryJobHTTP
 #import try_job_status_update
 #from try_job_svn import TryJobSubversion
 
 
 c = BuildmasterConfig = {}
 
 from buildbot.buildslave import BuildSlave
 from buildbot.changes.pb import PBChangeSource
 from buildbot.scheduler import AnyBranchScheduler, Triggerable
 from buildbot.status import html
 from buildbot.process import buildstep, factory, properties
-# TODO(nsylvain) master is not available in 8.08.
-#from buildbot.steps import master, shell, source, transfer, trigger
-from buildbot.steps import shell, source, transfer, trigger
+from buildbot.steps import master, shell, source, transfer, trigger
 from buildbot.status.builder import SUCCESS, FAILURE, WARNINGS, SKIPPED
 
 from twisted.internet import defer
 
 import re
 import simplejson
 
 WithProperties = properties.WithProperties
 
 class ConfigureBuild(buildstep.BuildStep):
@@ skipping 263 matching lines @@
 
 
 class UploadTestResults(transfer.FileUpload):
     slavesrc = "layout-test-results.zip"
     masterdest = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip")
 
     def __init__(self):
         transfer.FileUpload.__init__(self, self.slavesrc, self.masterdest)
 
 
-# TODO(nsylvain): master is not available in 0.7.8
-#class ExtractTestResults(master.MasterShellCommand):
-#    zipFile = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip")
-#    resultDirectory = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s)")
-#
-#    def __init__(self):
-#        master.MasterShellCommand.__init__(self, "")
-#
-#    def start(self):
-#        self.command = ["ditto", "-k", "-x", "-V", self.build.getProperties().render(self.zipFile), self.build.getProperties().render(self.resultDirectory)]
-#        return master.MasterShellCommand.start(self)
-#
-#    def finished(self, result):
-#        url = self.build.getProperties().render(self.resultDirectory).replace("public_html/", "")
-#        self.addURL("view results", url)
-#        result = master.MasterShellCommand.finished(self, result)
-#        self.step_status.setText(["uploaded results"])
-#        return result
+class ExtractTestResults(master.MasterShellCommand):
+    zipFile = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip")
+    resultDirectory = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s)")
+
+    def __init__(self):
+        master.MasterShellCommand.__init__(self, "")
+
+    def start(self):
+        self.command = ["ditto", "-k", "-x", "-V", self.build.getProperties().render(self.zipFile), self.build.getProperties().render(self.resultDirectory)]
+        return master.MasterShellCommand.start(self)
+
+    def finished(self, result):
+        url = self.build.getProperties().render(self.resultDirectory).replace("public_html/", "")
+        self.addURL("view results", url)
+        result = master.MasterShellCommand.finished(self, result)
+        self.step_status.setText(["uploaded results"])
+        return result
 
 
 class Factory(factory.BuildFactory):
+    CheckOutClass = CheckOutSource
     def __init__(self, platform, configuration, architectures, buildOnly):
         factory.BuildFactory.__init__(self)
         self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly)
-        self.addStep(CheckOutSource)
+        self.addStep(self.CheckOutClass)
         if platform == "win":
             self.addStep(InstallWin32Dependencies)
 
 # FIXME: Remove this factory once Chromium WebKit port build system is decoupled from
 # Chromium (https://bugs.webkit.org/show_bug.cgi?id=28396)
 class ChromiumBuildFactory(factory.BuildFactory):
     def __init__(self, platform, configuration, architectures):
         factory.BuildFactory.__init__(self)
         self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=True)
         self.addStep(UpdateChromiumSource)
         self.addStep(CompileChromiumWebKit)
 
 class BuildFactory(Factory):
     def __init__(self, platform, configuration, architectures, triggers):
         Factory.__init__(self, platform, configuration, architectures, True)
         self.addStep(CompileWebKit)
         self.addStep(ArchiveBuiltProduct)
         self.addStep(UploadBuiltProduct)
         self.addStep(trigger.Trigger, schedulerNames=triggers)
 
 class TestFactory(Factory):
     def __init__(self, platform, configuration, architectures):
         Factory.__init__(self, platform, configuration, architectures, False)
         self.addStep(DownloadBuiltProduct)
         self.addStep(ExtractBuiltProduct)
         self.addStep(RunJavaScriptCoreTests, skipBuild=True)
         self.addStep(RunWebKitTests, skipBuild=(platform == 'win'))
         self.addStep(ArchiveTestResults)
         self.addStep(UploadTestResults)
-        # TODO(nsylvain): master is not available in 0.7.8
-        #self.addStep(ExtractTestResults)
+        self.addStep(ExtractTestResults)
 
 class BuildAndTestFactory(Factory):
     TestClass = RunWebKitTests
     def __init__(self, platform, configuration, architectures):
         Factory.__init__(self, platform, configuration, architectures, False)
         self.addStep(CompileWebKit)
         self.addStep(RunJavaScriptCoreTests)
         self.addStep(self.TestClass)
         self.addStep(ArchiveTestResults)
         self.addStep(UploadTestResults)
-        # TODO(nsylvain): master is not available in 0.7.8
-        #self.addStep(ExtractTestResults)
+        self.addStep(ExtractTestResults)
 
 class BuildAndTestLeaksFactory(BuildAndTestFactory):
     TestClass = RunWebKitLeakTests
 
+class TryJobCheckOutSource(CheckOutSource):
+    mode = "copy"
 
 class TryFactory(Factory):
     """Similar to BuildAndTestFactory but doesn't archive the results."""
     TestClass = RunWebKitTests
+    CheckOutClass = TryJobCheckOutSource
     def __init__(self, platform, configuration, architectures):
         Factory.__init__(self, platform, configuration, architectures, False)
         self.addStep(CompileWebKit)
         self.addStep(RunJavaScriptCoreTests)
         self.addStep(self.TestClass)
 
 
 # FIXME: Remove this factory once Chromium WebKit port build system is decoupled from
 # Chromium (https://bugs.webkit.org/show_bug.cgi?id=28396)
 class TryChromiumFactory(ChromiumBuildFactory):
@@ skipping 70 matching lines @@
 
 # Keep last try jobs, the default is too low. Must keep at least a few days
 # worth of try jobs.
 c['buildHorizon'] = 3000
 c['logHorizon'] = 3000
 # Must be at least 2x the number of slaves.
 c['eventHorizon'] = 200
 # Must be at least 2x the number of on-going builds.
 c['buildCacheSize'] = 200