Changeset 147981 in webkit
- Timestamp:
- Apr 8, 2013 10:35:14 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
-
BuildSlaveSupport/build.webkit.org-config/config.json (modified) (3 diffs)
-
BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (12 diffs)
-
BuildSlaveSupport/build.webkit.org-config/templates/root.html (modified) (2 diffs)
-
ChangeLog (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
r147707 r147981 45 45 { "name": "oslo-mountainlion", "platform": "qt-5.0-mac-wk2"}, 46 46 47 { "name": "google-windows-1", "platform": "chromium-win" },48 { "name": "google-windows-2", "platform": "chromium-win" },49 { "name": "google-windows-3", "platform": "chromium-win" },50 { "name": "google-windows-4", "platform": "chromium-win" },51 { "name": "google-windows-perf", "platform": "chromium-win" },52 { "name": "google-mac-1", "platform": "chromium-mac" },53 { "name": "google-mac-2", "platform": "chromium-mac" },54 { "name": "google-mac-3", "platform": "chromium-mac" },55 { "name": "google-mac-4", "platform": "chromium-mac" },56 { "name": "google-mac-perf", "platform": "chromium-mac" },57 { "name": "google-linux-1", "platform": "chromium-linux" },58 { "name": "google-linux-2", "platform": "chromium-linux" },59 { "name": "google-linux-perf", "platform": "chromium-linux" },60 { "name": "google-linux-android", "platform": "chromium-android" },61 { "name": "google-android-tests", "platform": "chromium-android" },62 { "name": "google-android-perf", "platform": "chromium-android" },63 64 47 { "name": "wincairo-1", "platform": "wincairo" }, 65 48 … … 242 225 "platform": "qt-5.0-mac-wk2", "configuration": "release", "architectures": ["x86_64"], 243 226 "slavenames": ["oslo-mountainlion"] 244 },245 {246 "name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release",247 "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],248 "triggers": ["chromium-win-release-tests", "chromium-win-perf-tests"],249 "slavenames": ["google-windows-1", "google-windows-3"]250 },251 {252 "name": "Chromium Win Release (Tests)", "type": "Test", "builddir": "chromium-win-release-tests",253 "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],254 "slavenames": ["google-windows-2", "google-windows-4"]255 },256 {257 "name": "Chromium Win Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-win-perf-tests",258 "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],259 "slavenames": ["google-windows-perf"]260 },261 {262 "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release",263 "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],264 "triggers": ["chromium-mac-release-tests", "chromium-mac-perf-tests"],265 "slavenames": ["google-mac-1", "google-mac-3"]266 },267 {268 "name": "Chromium Mac Release (Tests)", "type": "Test", "builddir": "chromium-mac-release-tests",269 "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],270 "slavenames": ["google-mac-2", "google-mac-4"]271 },272 {273 "name": "Chromium Mac Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-mac-perf-tests",274 "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],275 "slavenames": ["google-mac-perf"]276 },277 {278 "name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release",279 "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],280 "triggers": ["chromium-linux-release-tests", "chromium-linux-perf-tests"],281 "slavenames": ["google-linux-1"]282 },283 {284 "name": "Chromium Linux Release (Tests)", "type": "Test", "builddir": "chromium-linux-release-tests",285 "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],286 "slavenames": ["google-linux-2"]287 },288 {289 "name": "Chromium Linux Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-linux-perf-tests",290 "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],291 "slavenames": ["google-linux-perf"]292 },293 {294 "name": "Chromium Android Release", "type": "Build", "builddir": "chromium-linux-android",295 "platform": "chromium-android", "configuration": "release", "architectures": ["i386"],296 "triggers": ["chromium-android-release-tests", "chromium-android-release-perf"],297 "slavenames": ["google-linux-android"]298 },299 {300 "name": "Chromium Android Release (Tests)", "type": "Test", "builddir": "chromium-android-release-tests",301 "platform": "chromium-android", "configuration": "release", "architectures": ["i386"],302 "slavenames": ["google-android-tests"]303 },304 {305 "name": "Chromium Android Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "chromium-android-release-perf",306 "platform": "chromium-android", "configuration": "release", "architectures": ["i386"],307 "slavenames": ["google-android-perf"]308 227 }, 309 228 { … … 402 321 "builderNames": ["Apple Win 7 Debug (Tests)"] 403 322 }, 404 { "type": "Triggerable", "name": "chromium-win-release-tests",405 "builderNames": ["Chromium Win Release (Tests)"]406 },407 { "type": "Triggerable", "name": "chromium-win-perf-tests",408 "builderNames": ["Chromium Win Release (Perf)"]409 },410 { "type": "Triggerable", "name": "chromium-mac-release-tests",411 "builderNames": ["Chromium Mac Release (Tests)"]412 },413 { "type": "Triggerable", "name": "chromium-mac-perf-tests",414 "builderNames": ["Chromium Mac Release (Perf)"]415 },416 { "type": "Triggerable", "name": "chromium-linux-release-tests",417 "builderNames": ["Chromium Linux Release (Tests)"]418 },419 { "type": "Triggerable", "name": "chromium-linux-perf-tests",420 "builderNames": ["Chromium Linux Release (Perf)"]421 },422 { "type": "Triggerable", "name": "chromium-android-release-tests",423 "builderNames": ["Chromium Android Release (Tests)"]424 },425 { "type": "Triggerable", "name": "chromium-android-release-perf",426 "builderNames": ["Chromium Android Release (Perf)"]427 },428 323 { "type": "Triggerable", "name": "gtk-linux-64-release-tests-wk2", 429 324 "builderNames": ["GTK Linux 64-bit Release WK2 (Tests)"] -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
r146990 r147981 161 161 command = ["perl", "./Tools/Scripts/update-webkitgtk-libs"] 162 162 haltOnFailure = True 163 164 class InstallChromiumDependencies(shell.ShellCommand):165 name = "gclient"166 description = ["updating chromium dependencies"]167 descriptionDone = ["updated chromium dependencies"]168 command = ["perl", "./Tools/Scripts/update-webkit-chromium", "--force"]169 haltOnFailure = True170 def start(self):171 if self.getProperty('fullPlatform') == "chromium-android":172 self.setCommand(self.command + ['--chromium-android'])173 174 return shell.ShellCommand.start(self)175 176 class CleanupChromiumCrashLogs(shell.ShellCommand):177 name = "cleanup crash logs"178 description = ["removing crash logs"]179 descriptionDone = ["removed crash logs"]180 command = ["python", "./Tools/BuildSlaveSupport/chromium/remove-crash-logs"]181 haltOnFailure = False182 183 class OutputAndroidDeviceStatus(shell.ShellCommand):184 name = "android device status"185 description = ["outputting android device status"]186 descriptionDone = ["outputted android device status"]187 command = ["python", "./Tools/BuildSlaveSupport/chromium/output-android-device-status"]188 haltOnFailure = False189 190 def appendCustomBuildFlags(step, platform, fullPlatform=""):191 if fullPlatform == "chromium-android":192 step.setCommand(step.command + ['--chromium-android'])193 elif platform in ('chromium', 'efl', 'gtk', 'qt', 'wincairo', 'wince', 'wx'):194 step.setCommand(step.command + ['--' + platform])195 163 196 164 … … 455 423 if platform.startswith('mac'): 456 424 self.setCommand(self.command + ['--no-build']) 457 if platform.startswith('chromium'):458 self.setCommand(self.command + ['--chromium'])459 if platform == 'chromium-android':460 self.setCommand(self.command + ['--chromium-android'])461 425 return shell.Test.start(self) 462 426 … … 664 628 665 629 return RunWebKitTests.start(self) 666 667 668 class RunChromiumWebKitUnitTests(shell.Test):669 name = "webkit-unit-tests"670 description = ["webkit-unit-tests running"]671 descriptionDone = ["webkit-unit-tests"]672 command = ["perl", "./Tools/Scripts/run-chromium-webkit-unit-tests",673 WithProperties("--%(configuration)s"), WithProperties("--platform=%(fullPlatform)s")]674 630 675 631 … … 765 721 if platform == "win": 766 722 self.addStep(InstallWin32Dependencies()) 767 if platform.startswith("chromium"):768 self.addStep(InstallChromiumDependencies())769 723 if platform == "gtk": 770 724 self.addStep(InstallGtkDependencies()) … … 785 739 if platform.startswith('mac') and configuration == "release": 786 740 return False; # https://bugs.webkit.org/show_bug.cgi?id=82652 787 return (platform == 'win' or platform.startswith('mac') or platform.startswith('chromium'))741 return platform == 'win' or platform.startswith('mac') 788 742 789 743 def pickLatestBuild(builder, requests): … … 795 749 def __init__(self, platform, configuration, architectures, SVNMirror=None): 796 750 Factory.__init__(self, platform, configuration, architectures, False, SVNMirror) 797 if platform.startswith("chromium"):798 self.addStep(CleanupChromiumCrashLogs())799 if platform == "chromium-android":800 self.addStep(OutputAndroidDeviceStatus())801 751 self.addStep(DownloadBuiltProduct()) 802 752 self.addStep(ExtractBuiltProduct()) 803 if not platform.startswith("chromium"): 804 self.addStep(RunJavaScriptCoreTests(buildJSCTool=False)) 805 if platform.startswith("chromium"): 806 self.addStep(RunChromiumWebKitUnitTests()) 753 self.addStep(RunJavaScriptCoreTests(buildJSCTool=False)) 807 754 self.addStep(self.TestClass(buildJSCTool=(platform != 'win'))) 808 755 … … 810 757 self.addStep(RunUnitTests()) 811 758 self.addStep(RunPythonTests()) 812 # Chromium Win runs in non-Cygwin environment, which is not yet fit 813 # for running tests. This can be removed once bug 48166 is fixed. 814 if platform != "chromium-win": 815 self.addStep(RunPerlTests()) 816 self.addStep(RunBindingsTests()) 759 self.addStep(RunPerlTests()) 760 self.addStep(RunBindingsTests()) 817 761 self.addStep(ArchiveTestResults()) 818 762 self.addStep(UploadTestResults()) … … 831 775 def __init__(self, platform, configuration, architectures, triggers=None, SVNMirror=None, **kwargs): 832 776 Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs) 833 if platform.startswith("chromium"):834 self.addStep(CleanupChromiumCrashLogs)835 777 self.addStep(self.CompileClass()) 836 if not platform.startswith("chromium"): 837 self.addStep(RunJavaScriptCoreTests()) 838 if platform.startswith("chromium"): 839 self.addStep(RunChromiumWebKitUnitTests) 778 self.addStep(RunJavaScriptCoreTests()) 840 779 self.addStep(self.TestClass()) 841 780 if unitTestsSupported(configuration, platform): 842 781 self.addStep(RunUnitTests()) 843 782 self.addStep(RunPythonTests()) 844 # Chromium Win runs in non-Cygwin environment, which is not yet fit 845 # for running tests. This can be removed once bug 48166 is fixed. 846 if platform != "chromium-win": 847 self.addStep(RunPerlTests()) 848 self.addStep(RunBindingsTests()) 783 self.addStep(RunPerlTests()) 784 self.addStep(RunBindingsTests()) 849 785 self.addStep(ArchiveTestResults()) 850 786 self.addStep(UploadTestResults()) … … 883 819 def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs): 884 820 Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs) 885 if platform.startswith("chromium"):886 self.addStep(CleanupChromiumCrashLogs)887 821 self.addStep(CompileWebKit()) 888 822 self.addStep(RunAndUploadPerfTests()) … … 891 825 def __init__(self, platform, configuration, architectures, SVNMirror=None, **kwargs): 892 826 Factory.__init__(self, platform, configuration, architectures, False, SVNMirror, **kwargs) 893 if platform.startswith("chromium"):894 self.addStep(CleanupChromiumCrashLogs)895 827 self.addStep(CompileWebKit()) 896 828 self.addStep(RunAndUploadPerfTestsWebKit2()) … … 901 833 self.addStep(DownloadBuiltProduct()) 902 834 self.addStep(ExtractBuiltProduct()) 903 if platform == "chromium-android":904 self.addStep(OutputAndroidDeviceStatus())905 835 self.addStep(RunAndUploadPerfTests()) 906 836 … … 982 912 builder["factory"] = factory(**factorykwargs) 983 913 984 if platform.startswith('chromium'): 985 builder["category"] = 'Chromium' 986 elif platform.startswith('mac'): 914 if platform.startswith('mac'): 987 915 builder["category"] = 'AppleMac' 988 916 elif platform == 'win': -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html
r145882 r147981 11 11 <ul> 12 12 <li><a href="console">Console</a> - <a href="console?category=AppleMac">Apple Mac</a>, <a href="console?category=AppleWin">Apple Windows</a>, 13 <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>13 <a href="console?category=GTK">GTK+</a>, <a href="console?category=Qt">Qt</a>, <a href="console?category=EFL">EFL</a> 14 14 and <a href="console?category=misc">miscellaneous</a></li> 15 15 <li><a href="waterfall">Waterfall Display</a>, a time-oriented summary of recent buildbot activity 16 16 - <a href="waterfall?category=AppleMac">Apple Mac</a>, <a href="waterfall?category=AppleWin">Apple Windows</a>, 17 <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>17 <a href="waterfall?category=GTK">GTK+</a>, <a href="waterfall?category=Qt">Qt</a>, <a href="waterfall?category=EFL">EFL</a> 18 18 and <a href="waterfall?category=misc">miscellaneous</a></li> 19 19 <li><a href="one_box_per_builder">Latest Build</a> for each builder is here.</li> … … 25 25 <li><a href="LeaksViewer">Leaks Viewer</a></li> 26 26 <li><a href="TestFailures">Test Failures</a></li> 27 <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>27 <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> 28 28 </ul> 29 29 </body> -
trunk/Tools/ChangeLog
r147979 r147981 1 2013-04-08 Ryosuke Niwa <rniwa@webkit.org> 2 3 Remove Chromium builders from build.webkit.org 4 https://bugs.webkit.org/show_bug.cgi?id=113990 5 6 Reviewed by Benjamin Poulain. 7 8 Removed. 9 10 * BuildSlaveSupport/build.webkit.org-config/config.json: 11 * BuildSlaveSupport/build.webkit.org-config/master.cfg: 12 (InstallGtkDependencies): 13 (RunUnitTests.start): 14 (RunWebKit2Tests.start): 15 (Factory.__init__): 16 (unitTestsSupported): 17 (TestFactory.__init__): 18 (BuildAndTestFactory.__init__): 19 (BuildAndPerfTestFactory.__init__): 20 (BuildAndPerfTestWebKit2Factory.__init__): 21 (DownloadAndPerfTestFactory.__init__): 22 (loadBuilderConfig): 23 * BuildSlaveSupport/build.webkit.org-config/templates/root.html: 24 1 25 2013-04-08 Benjamin Poulain <benjamin@webkit.org> 2 26
Note: See TracChangeset
for help on using the changeset viewer.
