Commit 18ae489d authored by rniwa@webkit.org's avatar rniwa@webkit.org

Remove Chromium builders from build.webkit.org

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

Reviewed by Benjamin Poulain.

Removed.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(InstallGtkDependencies):
(RunUnitTests.start):
(RunWebKit2Tests.start):
(Factory.__init__):
(unitTestsSupported):
(TestFactory.__init__):
(BuildAndTestFactory.__init__):
(BuildAndPerfTestFactory.__init__):
(BuildAndPerfTestWebKit2Factory.__init__):
(DownloadAndPerfTestFactory.__init__):
(loadBuilderConfig):
* BuildSlaveSupport/build.webkit.org-config/templates/root.html:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147981 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 649b7f61
......@@ -44,23 +44,6 @@
{ "name": "oslo-mountainlion", "platform": "qt-5.0-mac-wk2"},
{ "name": "google-windows-1", "platform": "chromium-win" },
{ "name": "google-windows-2", "platform": "chromium-win" },
{ "name": "google-windows-3", "platform": "chromium-win" },
{ "name": "google-windows-4", "platform": "chromium-win" },
{ "name": "google-windows-perf", "platform": "chromium-win" },
{ "name": "google-mac-1", "platform": "chromium-mac" },
{ "name": "google-mac-2", "platform": "chromium-mac" },
{ "name": "google-mac-3", "platform": "chromium-mac" },
{ "name": "google-mac-4", "platform": "chromium-mac" },
{ "name": "google-mac-perf", "platform": "chromium-mac" },
{ "name": "google-linux-1", "platform": "chromium-linux" },
{ "name": "google-linux-2", "platform": "chromium-linux" },
{ "name": "google-linux-perf", "platform": "chromium-linux" },
{ "name": "google-linux-android", "platform": "chromium-android" },
{ "name": "google-android-tests", "platform": "chromium-android" },
{ "name": "google-android-perf", "platform": "chromium-android" },
{ "name": "wincairo-1", "platform": "wincairo" },
{ "name": "wince-1", "platform": "wince" },
......@@ -242,70 +225,6 @@
"platform": "qt-5.0-mac-wk2", "configuration": "release", "architectures": ["x86_64"],
"slavenames": ["oslo-mountainlion"]
},
{
"name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release",
"platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
"triggers": ["chromium-win-release-tests", "chromium-win-perf-tests"],
"slavenames": ["google-windows-1", "google-windows-3"]
},
{
"name": "Chromium Win Release (Tests)", "type": "Test", "builddir": "chromium-win-release-tests",
"platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-windows-2", "google-windows-4"]
},
{
"name": "Chromium Win Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-win-perf-tests",
"platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-windows-perf"]
},
{
"name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release",
"platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
"triggers": ["chromium-mac-release-tests", "chromium-mac-perf-tests"],
"slavenames": ["google-mac-1", "google-mac-3"]
},
{
"name": "Chromium Mac Release (Tests)", "type": "Test", "builddir": "chromium-mac-release-tests",
"platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-mac-2", "google-mac-4"]
},
{
"name": "Chromium Mac Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-mac-perf-tests",
"platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-mac-perf"]
},
{
"name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release",
"platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
"triggers": ["chromium-linux-release-tests", "chromium-linux-perf-tests"],
"slavenames": ["google-linux-1"]
},
{
"name": "Chromium Linux Release (Tests)", "type": "Test", "builddir": "chromium-linux-release-tests",
"platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-linux-2"]
},
{
"name": "Chromium Linux Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-linux-perf-tests",
"platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-linux-perf"]
},
{
"name": "Chromium Android Release", "type": "Build", "builddir": "chromium-linux-android",
"platform": "chromium-android", "configuration": "release", "architectures": ["i386"],
"triggers": ["chromium-android-release-tests", "chromium-android-release-perf"],
"slavenames": ["google-linux-android"]
},
{
"name": "Chromium Android Release (Tests)", "type": "Test", "builddir": "chromium-android-release-tests",
"platform": "chromium-android", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-android-tests"]
},
{
"name": "Chromium Android Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-android-release-perf",
"platform": "chromium-android", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-android-perf"]
},
{
"name": "WinCairo Release", "type": "BuildAndTest", "builddir": "win-cairo-release",
"platform": "wincairo", "configuration": "release", "architectures": ["i386"],
......@@ -401,30 +320,6 @@
{ "type": "Triggerable", "name": "win-debug-tests",
"builderNames": ["Apple Win 7 Debug (Tests)"]
},
{ "type": "Triggerable", "name": "chromium-win-release-tests",
"builderNames": ["Chromium Win Release (Tests)"]
},
{ "type": "Triggerable", "name": "chromium-win-perf-tests",
"builderNames": ["Chromium Win Release (Perf)"]
},
{ "type": "Triggerable", "name": "chromium-mac-release-tests",
"builderNames": ["Chromium Mac Release (Tests)"]
},
{ "type": "Triggerable", "name": "chromium-mac-perf-tests",
"builderNames": ["Chromium Mac Release (Perf)"]
},
{ "type": "Triggerable", "name": "chromium-linux-release-tests",
"builderNames": ["Chromium Linux Release (Tests)"]
},
{ "type": "Triggerable", "name": "chromium-linux-perf-tests",
"builderNames": ["Chromium Linux Release (Perf)"]
},
{ "type": "Triggerable", "name": "chromium-android-release-tests",
"builderNames": ["Chromium Android Release (Tests)"]
},
{ "type": "Triggerable", "name": "chromium-android-release-perf",
"builderNames": ["Chromium Android Release (Perf)"]
},
{ "type": "Triggerable", "name": "gtk-linux-64-release-tests-wk2",
"builderNames": ["GTK Linux 64-bit Release WK2 (Tests)"]
}
......
......@@ -161,38 +161,6 @@ class InstallGtkDependencies(shell.ShellCommand):
command = ["perl", "./Tools/Scripts/update-webkitgtk-libs"]
haltOnFailure = True
class InstallChromiumDependencies(shell.ShellCommand):
name = "gclient"
description = ["updating chromium dependencies"]
descriptionDone = ["updated chromium dependencies"]
command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"]
haltOnFailure = True
def start(self):
if self.getProperty('fullPlatform') == "chromium-android":
self.setCommand(self.command + ['--chromium-android'])
return shell.ShellCommand.start(self)
class CleanupChromiumCrashLogs(shell.ShellCommand):
name = "cleanup crash logs"
description = ["removing crash logs"]
descriptionDone = ["removed crash logs"]
command = ["python", "./Tools/BuildSlaveSupport/chromium/remove-crash-logs"]
haltOnFailure = False
class OutputAndroidDeviceStatus(shell.ShellCommand):
name = "android device status"
description = ["outputting android device status"]
descriptionDone = ["outputted android device status"]
command = ["python", "./Tools/BuildSlaveSupport/chromium/output-android-device-status"]
haltOnFailure = False
def appendCustomBuildFlags(step, platform, fullPlatform=""):
if fullPlatform == "chromium-android":
step.setCommand(step.command + ['--chromium-android'])
elif platform in ('chromium', 'efl', 'gtk', 'qt', 'wincairo', 'wince', 'wx'):
step.setCommand(step.command + ['--' + platform])
class CompileWebKit(shell.Compile):
command = ["perl", "./Tools/Scripts/build-webkit", WithProperties("--%(configuration)s")]
......@@ -454,10 +422,6 @@ class RunUnitTests(TestWithFailureCount):
self.setCommand(self.command + ['--no-build'])
if platform.startswith('mac'):
self.setCommand(self.command + ['--no-build'])
if platform.startswith('chromium'):
self.setCommand(self.command + ['--chromium'])
if platform == 'chromium-android':
self.setCommand(self.command + ['--chromium-android'])
return shell.Test.start(self)
def countFailures(self, cmd):
......@@ -665,14 +629,6 @@ class RunWebKit2Tests(RunWebKitTests):
return RunWebKitTests.start(self)
class RunChromiumWebKitUnitTests(shell.Test):
name = "webkit-unit-tests"
description = ["webkit-unit-tests running"]
descriptionDone = ["webkit-unit-tests"]
command = ["perl", "./Tools/Scripts/run-chromium-webkit-unit-tests",
WithProperties("--%(configuration)s"), WithProperties("--platform=%(fullPlatform)s")]
class RunAndUploadPerfTests(shell.Test):
name = "perf-test"
description = ["perf-tests running"]
......@@ -764,8 +720,6 @@ class Factory(factory.BuildFactory):
self.addStep(DeleteStaleBuildFiles())
if platform == "win":
self.addStep(InstallWin32Dependencies())
if platform.startswith("chromium"):
self.addStep(InstallChromiumDependencies())
if platform == "gtk":
self.addStep(InstallGtkDependencies())
if platform == "efl":
......@@ -784,7 +738,7 @@ class BuildFactory(Factory):
def unitTestsSupported(configuration, platform):
if platform.startswith('mac') and configuration == "release":
return False; # https://bugs.webkit.org/show_bug.cgi?id=82652
return (platform == 'win' or platform.startswith('mac') or platform.startswith('chromium'))
return platform == 'win' or platform.startswith('mac')
def pickLatestBuild(builder, requests):
return max(requests, key=operator.attrgetter("submittedAt"))
......@@ -794,26 +748,16 @@ class TestFactory(Factory):
ExtractTestResultsClass = ExtractTestResults
def __init__(self, platform, configuration, architectures, SVNMirror=None):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror)
if platform.startswith("chromium"):
self.addStep(CleanupChromiumCrashLogs())
if platform == "chromium-android":
self.addStep(OutputAndroidDeviceStatus())
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
if not platform.startswith("chromium"):
self.addStep(RunJavaScriptCoreTests(buildJSCTool=False))
if platform.startswith("chromium"):
self.addStep(RunChromiumWebKitUnitTests())
self.addStep(RunJavaScriptCoreTests(buildJSCTool=False))
self.addStep(self.TestClass(buildJSCTool=(platform != 'win')))
if unitTestsSupported(configuration, platform):
self.addStep(RunUnitTests())
self.addStep(RunPythonTests())
# Chromium Win runs in non-Cygwin environment, which is not yet fit
# for running tests. This can be removed once bug 48166 is fixed.
if platform != "chromium-win":
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
self.addStep(ArchiveTestResults())
self.addStep(UploadTestResults())
self.addStep(self.ExtractTestResultsClass())
......@@ -830,22 +774,14 @@ class BuildAndTestFactory(Factory):
ExtractTestResultsClass = ExtractTestResults
def __init__(self, platform, configuration, architectures, triggers=None, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
if platform.startswith("chromium"):
self.addStep(CleanupChromiumCrashLogs)
self.addStep(self.CompileClass())
if not platform.startswith("chromium"):
self.addStep(RunJavaScriptCoreTests())
if platform.startswith("chromium"):
self.addStep(RunChromiumWebKitUnitTests)
self.addStep(RunJavaScriptCoreTests())
self.addStep(self.TestClass())
if unitTestsSupported(configuration, platform):
self.addStep(RunUnitTests())
self.addStep(RunPythonTests())
# Chromium Win runs in non-Cygwin environment, which is not yet fit
# for running tests. This can be removed once bug 48166 is fixed.
if platform != "chromium-win":
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
self.addStep(ArchiveTestResults())
self.addStep(UploadTestResults())
self.addStep(self.ExtractTestResultsClass())
......@@ -882,16 +818,12 @@ class TestWebKit2Factory(TestFactory):
class BuildAndPerfTestFactory(Factory):
def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
if platform.startswith("chromium"):
self.addStep(CleanupChromiumCrashLogs)
self.addStep(CompileWebKit())
self.addStep(RunAndUploadPerfTests())
class BuildAndPerfTestWebKit2Factory(Factory):
def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
if platform.startswith("chromium"):
self.addStep(CleanupChromiumCrashLogs)
self.addStep(CompileWebKit())
self.addStep(RunAndUploadPerfTestsWebKit2())
......@@ -900,8 +832,6 @@ class DownloadAndPerfTestFactory(Factory):
Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
if platform == "chromium-android":
self.addStep(OutputAndroidDeviceStatus())
self.addStep(RunAndUploadPerfTests())
class DownloadAndPerfTestWebKit2Factory(Factory):
......@@ -981,9 +911,7 @@ def loadBuilderConfig(c):
builder["factory"] = factory(**factorykwargs)
if platform.startswith('chromium'):
builder["category"] = 'Chromium'
elif platform.startswith('mac'):
if platform.startswith('mac'):
builder["category"] = 'AppleMac'
elif platform == 'win':
builder["category"] = 'AppleWin'
......
......@@ -10,11 +10,11 @@
<ul>
<li><a href="console">Console</a> - <a href="console?category=AppleMac">Apple Mac</a>, <a href="console?category=AppleWin">Apple Windows</a>,
<a href="console?category=GTK">GTK+</a>, <a href="console?category=Qt">Qt</a>, <a href="console?category=Chromium">Chromium</a>, <a href="console?category=EFL">EFL</a>
<a href="console?category=GTK">GTK+</a>, <a href="console?category=Qt">Qt</a>, <a href="console?category=EFL">EFL</a>
and <a href="console?category=misc">miscellaneous</a></li>
<li><a href="waterfall">Waterfall Display</a>, a time-oriented summary of recent buildbot activity
- <a href="waterfall?category=AppleMac">Apple Mac</a>, <a href="waterfall?category=AppleWin">Apple Windows</a>,
<a href="waterfall?category=GTK">GTK+</a>, <a href="waterfall?category=Qt">Qt</a>, <a href="waterfall?category=Chromium">Chromium</a>, <a href="waterfall?category=EFL">EFL</a>
<a href="waterfall?category=GTK">GTK+</a>, <a href="waterfall?category=Qt">Qt</a>, <a href="waterfall?category=EFL">EFL</a>
and <a href="waterfall?category=misc">miscellaneous</a></li>
<li><a href="one_box_per_builder">Latest Build</a> for each builder is here.</li>
<li><a href="one_line_per_build">Recent Builds</a> are summarized here, one per line.</li>
......@@ -24,7 +24,7 @@
<li><a href="results">Test Results</a></li>
<li><a href="LeaksViewer">Leaks Viewer</a></li>
<li><a href="TestFailures">Test Failures</a></li>
<li><a href="http://perf.webkit.org/">WebKit Perf Monitor</a> results submitted by <a href="http://build.webkit.org/waterfall?show=Apple%20Lion%20Release%20%28Perf%29&show=Apple%20MountainLion%20Release%20%28Perf%29&show=Chromium%20Android%20Release%20%28Perf%29&show=Chromium%20Linux%20Release%20%28Perf%29&show=Chromium%20Mac%20Release%20%28Perf%29&show=Chromium%20Win%20Release%20%28Perf%29&show=Qt%20Linux%2064-bit%20Release%20%28Perf%29&show=Qt%20Linux%2064-bit%20Release%20%28WebKit2%20Perf%29&show=EFL%20Linux%2064-bit%20Release%20WK2%20%28Perf%29">performance bots</a></li>
<li><a href="http://perf.webkit.org/">WebKit Perf Monitor</a> results submitted by <a href="http://build.webkit.org/waterfall?show=Apple%20Lion%20Release%20%28Perf%29&show=Apple%20MountainLion%20Release%20%28Perf%29&show=Qt%20Linux%2064-bit%20Release%20%28Perf%29&show=Qt%20Linux%2064-bit%20Release%20%28WebKit2%20Perf%29&show=EFL%20Linux%2064-bit%20Release%20WK2%20%28Perf%29">performance bots</a></li>
</ul>
</body>
</html>
2013-04-08 Ryosuke Niwa <rniwa@webkit.org>
Remove Chromium builders from build.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=113990
Reviewed by Benjamin Poulain.
Removed.
* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(InstallGtkDependencies):
(RunUnitTests.start):
(RunWebKit2Tests.start):
(Factory.__init__):
(unitTestsSupported):
(TestFactory.__init__):
(BuildAndTestFactory.__init__):
(BuildAndPerfTestFactory.__init__):
(BuildAndPerfTestWebKit2Factory.__init__):
(DownloadAndPerfTestFactory.__init__):
(loadBuilderConfig):
* BuildSlaveSupport/build.webkit.org-config/templates/root.html:
2013-04-08 Benjamin Poulain <benjamin@webkit.org>
Remove HTML Notification
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment