Changeset 268594 in webkit
- Timestamp:
- Oct 16, 2020 9:06:16 AM (3 years ago)
- Location:
- trunk/Tools
- Files:
-
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
r266208 r268594 1 # Copyright (C) 2017 Apple Inc. All rights reserved.1 # Copyright (C) 2017-2020 Apple Inc. All rights reserved. 2 2 # 3 3 # Redistribution and use in source and binary forms, with or without … … 28 28 29 29 class Factory(factory.BuildFactory): 30 def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments, SVNMirror,device_model):30 def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments, device_model): 31 31 factory.BuildFactory.__init__(self) 32 self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, additionalArguments=additionalArguments, SVNMirror=SVNMirror, device_model=device_model)) 33 if SVNMirror: 34 self.addStep(WaitForSVNServer()) 35 self.addStep(CheckOutSource(SVNMirror=SVNMirror)) 32 self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, additionalArguments=additionalArguments, device_model=device_model)) 33 self.addStep(CheckOutSource()) 36 34 if not (platform == "jsc-only"): 37 35 self.addStep(KillOldProcesses()) … … 50 48 ShouldRunMiniBrowserBundleStep = False 51 49 52 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None,device_model=None):53 Factory.__init__(self, platform, configuration, architectures, True, additionalArguments, SVNMirror,device_model)50 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None): 51 Factory.__init__(self, platform, configuration, architectures, True, additionalArguments, device_model) 54 52 55 53 if platform == "win" or platform.startswith("playstation"): … … 81 79 self.addStep(ExtractBuiltProduct()) 82 80 83 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None, **kwargs):84 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model, **kwargs)81 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None, **kwargs): 82 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs) 85 83 self.getProduct() 86 84 … … 129 127 self.addStep(CompileWebKit()) 130 128 131 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None,device_model=None, **kwargs):132 TestFactory.__init__(self, platform, configuration, architectures, additionalArguments, SVNMirror,device_model, **kwargs)129 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None, **kwargs): 130 TestFactory.__init__(self, platform, configuration, architectures, additionalArguments, device_model, **kwargs) 133 131 if triggers: 134 132 self.addStep(ArchiveBuiltProduct()) … … 138 136 139 137 class BuildAndTestLLINTCLoopFactory(Factory): 140 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None,device_model=None, **kwargs):141 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model, **kwargs)138 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None, **kwargs): 139 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs) 142 140 self.addStep(CompileLLINTCLoop()) 143 141 self.addStep(RunLLINTCLoopTests()) … … 145 143 146 144 class BuildAndTest32bitJSCFactory(Factory): 147 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None,device_model=None, **kwargs):148 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model, **kwargs)145 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None, **kwargs): 146 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs) 149 147 self.addStep(Compile32bitJSC()) 150 148 self.addStep(Run32bitJSCTests()) … … 156 154 157 155 class BuildAndRemoteJSCTestsFactory(Factory): 158 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None,device_model=None):159 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model)156 def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None): 157 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model) 160 158 self.addStep(CompileJSCOnly(timeout=60 * 60)) 161 159 self.addStep(RunRemoteJavaScriptCoreTests(timeout=60 * 60)) … … 163 161 164 162 class TestWebKit1LeaksFactory(Factory): 165 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None):166 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model)163 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None): 164 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model) 167 165 self.addStep(DownloadBuiltProduct()) 168 166 self.addStep(ExtractBuiltProduct()) … … 191 189 192 190 class TestJSCFactory(Factory): 193 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None):194 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model)191 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None): 192 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model) 195 193 self.addStep(DownloadBuiltProduct()) 196 194 self.addStep(ExtractBuiltProduct()) … … 199 197 200 198 class Test262Factory(Factory): 201 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None):202 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model)199 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None): 200 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model) 203 201 self.addStep(DownloadBuiltProduct()) 204 202 self.addStep(ExtractBuiltProduct()) … … 207 205 208 206 class TestJSFactory(Factory): 209 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None):210 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model)207 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None): 208 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model) 211 209 self.addStep(DownloadBuiltProduct()) 212 210 self.addStep(ExtractBuiltProduct()) … … 216 214 217 215 class TestWebDriverFactory(Factory): 218 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None):219 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model)216 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None): 217 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model) 220 218 self.addStep(DownloadBuiltProduct()) 221 219 self.addStep(ExtractBuiltProduct()) … … 232 230 233 231 class BuildAndPerfTestFactory(Factory): 234 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None, **kwargs):235 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model, **kwargs)232 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None, **kwargs): 233 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs) 236 234 self.addStep(CompileWebKit()) 237 235 self.addStep(RunAndUploadPerfTests()) … … 241 239 242 240 class DownloadAndPerfTestFactory(Factory): 243 def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None,device_model=None, **kwargs):244 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror,device_model, **kwargs)241 def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None, **kwargs): 242 Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs) 245 243 self.addStep(DownloadBuiltProduct()) 246 244 self.addStep(ExtractBuiltProduct()) -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py
r268429 r268594 106 106 factory = globals()[factoryName] 107 107 factorykwargs = {} 108 for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", " SVNMirror", "device_model":108 for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", "device_model": 109 109 value = builder.pop(key, None) 110 110 if value: -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
r268496 r268594 77 77 descriptionDone = ["configured build"] 78 78 79 def __init__(self, platform, configuration, architecture, buildOnly, additionalArguments, SVNMirror,device_model, *args, **kwargs):79 def __init__(self, platform, configuration, architecture, buildOnly, additionalArguments, device_model, *args, **kwargs): 80 80 buildstep.BuildStep.__init__(self, *args, **kwargs) 81 81 self.platform = platform … … 87 87 self.buildOnly = buildOnly 88 88 self.additionalArguments = additionalArguments 89 self.SVNMirror = SVNMirror90 89 self.device_model = device_model 91 self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, additionalArguments=additionalArguments, SVNMirror=SVNMirror,device_model=device_model)90 self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, additionalArguments=additionalArguments, device_model=device_model) 92 91 93 92 def start(self): … … 98 97 self.setProperty("buildOnly", self.buildOnly) 99 98 self.setProperty("additionalArguments", self.additionalArguments) 100 self.setProperty("SVNMirror", self.SVNMirror)101 99 self.setProperty("device_model", self.device_model) 102 100 self.finished(SUCCESS) … … 107 105 mode = "update" 108 106 109 def __init__(self, SVNMirror,**kwargs):110 kwargs['baseURL'] = SVNMirror or"https://svn.webkit.org/repository/webkit/"107 def __init__(self, **kwargs): 108 kwargs['baseURL'] = "https://svn.webkit.org/repository/webkit/" 111 109 kwargs['defaultBranch'] = "trunk" 112 110 kwargs['mode'] = self.mode 113 111 source.SVN.__init__(self, **kwargs) 114 self.addFactoryArguments(SVNMirror=SVNMirror)115 116 117 class WaitForSVNServer(shell.ShellCommand):118 name = "wait-for-svn-server"119 command = ["python", "./Tools/BuildSlaveSupport/wait-for-SVN-server.py", "-r", WithProperties("%(revision)s"), "-s", WithProperties("%(SVNMirror)s")]120 description = ["waiting for SVN server"]121 descriptionDone = ["SVN server is ready"]122 warnOnFailure = True123 124 def evaluateCommand(self, cmd):125 if cmd.rc != 0:126 return WARNINGS127 return SUCCESS128 112 129 113 -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
r268496 r268594 466 466 Testing completed, Exit status: 3 467 467 """) 468 469 470 class SVNMirrorTest(unittest.TestCase):471 def setUp(self):472 self.config = json.load(open('config.json'))473 474 def get_SVNMirrorFromConfig(self, builderName):475 SVNMirror = None476 for builder in self.config['builders']:477 if builder['name'] == builderName:478 SVNMirror = builder.pop('SVNMirror', 'https://svn.webkit.org/repository/webkit/')479 return SVNMirror480 481 def test_CheckOutSource(self):482 # SVN mirror feature isn't unittestable now with source.oldsource.SVN(==source.SVN) , only with source.svn.SVN(==SVN)483 # https://bugs.webkit.org/show_bug.cgi?id=85887484 if issubclass(CheckOutSource, source.SVN):485 return486 487 # Compare CheckOutSource.baseURL with SVNMirror (or with the default URL) in config.json for all builders488 for builder in c['builders']:489 for buildStepFactory, kwargs in builder['factory'].steps:490 if str(buildStepFactory).split('.')[-1] == 'CheckOutSource':491 CheckOutSourceInstance = buildStepFactory(**kwargs)492 self.assertEqual(CheckOutSourceInstance.baseURL, self.get_SVNMirrorFromConfig(builder['name']))493 468 494 469 -
trunk/Tools/ChangeLog
r268591 r268594 1 2020-10-16 Aakash Jain <aakash_jain@apple.com> 2 3 [build.webkit.org] Remove SVNMirror 4 https://bugs.webkit.org/show_bug.cgi?id=217823 5 6 Reviewed by Jonathan Bedard. 7 8 * BuildSlaveSupport/build.webkit.org-config/factories.py: Removed SVNMirror. 9 * BuildSlaveSupport/build.webkit.org-config/steps.py: Ditto. 10 * BuildSlaveSupport/build.webkit.org-config/loadConfig.py: Ditto. 11 (WaitForSVNServer): Deleted. 12 (WaitForSVNServer.evaluateCommand): Deleted. 13 * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: 14 * BuildSlaveSupport/wait-for-SVN-server.py: Removed. 15 1 16 2020-10-16 Carlos Alberto Lopez Perez <clopez@igalia.com> 2 17
Note: See TracChangeset
for help on using the changeset viewer.