Log Message
[build.webkit.org] Remove SVNMirror https://bugs.webkit.org/show_bug.cgi?id=217823
Reviewed by Jonathan Bedard. * BuildSlaveSupport/build.webkit.org-config/factories.py: Removed SVNMirror. * BuildSlaveSupport/build.webkit.org-config/steps.py: Ditto. * BuildSlaveSupport/build.webkit.org-config/loadConfig.py: Ditto. (WaitForSVNServer): Deleted. (WaitForSVNServer.evaluateCommand): Deleted. * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: * BuildSlaveSupport/wait-for-SVN-server.py: Removed.
Modified Paths
- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py
- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
- trunk/Tools/ChangeLog
Removed Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py (268593 => 268594)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2020-10-16 15:52:27 UTC (rev 268593)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2020-10-16 16:06:16 UTC (rev 268594)
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 Apple Inc. All rights reserved.
+# Copyright (C) 2017-2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -27,12 +27,10 @@
class Factory(factory.BuildFactory):
- def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments, SVNMirror, device_model):
+ def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments, device_model):
factory.BuildFactory.__init__(self)
- self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, additionalArguments=additionalArguments, SVNMirror=SVNMirror, device_model=device_model))
- if SVNMirror:
- self.addStep(WaitForSVNServer())
- self.addStep(CheckOutSource(SVNMirror=SVNMirror))
+ self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, additionalArguments=additionalArguments, device_model=device_model))
+ self.addStep(CheckOutSource())
if not (platform == "jsc-only"):
self.addStep(KillOldProcesses())
self.addStep(CleanBuildIfScheduled())
@@ -49,8 +47,8 @@
ShouldRunJSCBundleStep = False
ShouldRunMiniBrowserBundleStep = False
- def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, device_model=None):
- Factory.__init__(self, platform, configuration, architectures, True, additionalArguments, SVNMirror, device_model)
+ def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None):
+ Factory.__init__(self, platform, configuration, architectures, True, additionalArguments, device_model)
if platform == "win" or platform.startswith("playstation"):
self.addStep(CompileWebKit(timeout=2 * 60 * 60))
@@ -80,8 +78,8 @@
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model, **kwargs)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs)
self.getProduct()
if platform == 'wincairo':
@@ -128,8 +126,8 @@
def getProduct(self):
self.addStep(CompileWebKit())
- def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, device_model=None, **kwargs):
- TestFactory.__init__(self, platform, configuration, architectures, additionalArguments, SVNMirror, device_model, **kwargs)
+ def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None, **kwargs):
+ TestFactory.__init__(self, platform, configuration, architectures, additionalArguments, device_model, **kwargs)
if triggers:
self.addStep(ArchiveBuiltProduct())
self.addStep(UploadBuiltProduct())
@@ -137,15 +135,15 @@
class BuildAndTestLLINTCLoopFactory(Factory):
- def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, device_model=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model, **kwargs)
+ def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs)
self.addStep(CompileLLINTCLoop())
self.addStep(RunLLINTCLoopTests())
class BuildAndTest32bitJSCFactory(Factory):
- def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, device_model=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model, **kwargs)
+ def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs)
self.addStep(Compile32bitJSC())
self.addStep(Run32bitJSCTests())
@@ -155,15 +153,15 @@
class BuildAndRemoteJSCTestsFactory(Factory):
- def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, device_model=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model)
+ def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, device_model=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model)
self.addStep(CompileJSCOnly(timeout=60 * 60))
self.addStep(RunRemoteJavaScriptCoreTests(timeout=60 * 60))
class TestWebKit1LeaksFactory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunWebKit1LeakTests())
@@ -190,8 +188,8 @@
class TestJSCFactory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunJavaScriptCoreTests())
@@ -198,8 +196,8 @@
class Test262Factory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunTest262Tests())
@@ -206,8 +204,8 @@
class TestJSFactory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunJavaScriptCoreTests())
@@ -215,8 +213,8 @@
class TestWebDriverFactory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunWebDriverTests())
@@ -231,8 +229,8 @@
class BuildAndPerfTestFactory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model, **kwargs)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs)
self.addStep(CompileWebKit())
self.addStep(RunAndUploadPerfTests())
if platform == "gtk":
@@ -240,8 +238,8 @@
class DownloadAndPerfTestFactory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model, **kwargs)
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, device_model=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, device_model, **kwargs)
self.addStep(DownloadBuiltProduct())
self.addStep(ExtractBuiltProduct())
self.addStep(RunAndUploadPerfTests())
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py (268593 => 268594)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py 2020-10-16 15:52:27 UTC (rev 268593)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py 2020-10-16 16:06:16 UTC (rev 268594)
@@ -105,7 +105,7 @@
factoryName = builder.pop('factory')
factory = globals()[factoryName]
factorykwargs = {}
- for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", "SVNMirror", "device_model":
+ for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", "device_model":
value = builder.pop(key, None)
if value:
factorykwargs[key] = value
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (268593 => 268594)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2020-10-16 15:52:27 UTC (rev 268593)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2020-10-16 16:06:16 UTC (rev 268594)
@@ -76,7 +76,7 @@
description = ["configuring build"]
descriptionDone = ["configured build"]
- def __init__(self, platform, configuration, architecture, buildOnly, additionalArguments, SVNMirror, device_model, *args, **kwargs):
+ def __init__(self, platform, configuration, architecture, buildOnly, additionalArguments, device_model, *args, **kwargs):
buildstep.BuildStep.__init__(self, *args, **kwargs)
self.platform = platform
if platform != 'jsc-only':
@@ -86,9 +86,8 @@
self.architecture = architecture
self.buildOnly = buildOnly
self.additionalArguments = additionalArguments
- self.SVNMirror = SVNMirror
self.device_model = device_model
- self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, additionalArguments=additionalArguments, SVNMirror=SVNMirror, device_model=device_model)
+ self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, additionalArguments=additionalArguments, device_model=device_model)
def start(self):
self.setProperty("platform", self.platform)
@@ -97,7 +96,6 @@
self.setProperty("architecture", self.architecture)
self.setProperty("buildOnly", self.buildOnly)
self.setProperty("additionalArguments", self.additionalArguments)
- self.setProperty("SVNMirror", self.SVNMirror)
self.setProperty("device_model", self.device_model)
self.finished(SUCCESS)
return defer.succeed(None)
@@ -106,27 +104,13 @@
class CheckOutSource(source.SVN):
mode = "update"
- def __init__(self, SVNMirror, **kwargs):
- kwargs['baseURL'] = SVNMirror or "https://svn.webkit.org/repository/webkit/"
+ def __init__(self, **kwargs):
+ kwargs['baseURL'] = "https://svn.webkit.org/repository/webkit/"
kwargs['defaultBranch'] = "trunk"
kwargs['mode'] = self.mode
source.SVN.__init__(self, **kwargs)
- self.addFactoryArguments(SVNMirror=SVNMirror)
-class WaitForSVNServer(shell.ShellCommand):
- name = "wait-for-svn-server"
- command = ["python", "./Tools/BuildSlaveSupport/wait-for-SVN-server.py", "-r", WithProperties("%(revision)s"), "-s", WithProperties("%(SVNMirror)s")]
- description = ["waiting for SVN server"]
- descriptionDone = ["SVN server is ready"]
- warnOnFailure = True
-
- def evaluateCommand(self, cmd):
- if cmd.rc != 0:
- return WARNINGS
- return SUCCESS
-
-
class InstallWin32Dependencies(shell.Compile):
description = ["installing dependencies"]
descriptionDone = ["installed dependencies"]
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (268593 => 268594)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-10-16 15:52:27 UTC (rev 268593)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-10-16 16:06:16 UTC (rev 268594)
@@ -467,31 +467,6 @@
""")
-class SVNMirrorTest(unittest.TestCase):
- def setUp(self):
- self.config = json.load(open('config.json'))
-
- def get_SVNMirrorFromConfig(self, builderName):
- SVNMirror = None
- for builder in self.config['builders']:
- if builder['name'] == builderName:
- SVNMirror = builder.pop('SVNMirror', 'https://svn.webkit.org/repository/webkit/')
- return SVNMirror
-
- def test_CheckOutSource(self):
- # SVN mirror feature isn't unittestable now with source.oldsource.SVN(==source.SVN) , only with source.svn.SVN(==SVN)
- # https://bugs.webkit.org/show_bug.cgi?id=85887
- if issubclass(CheckOutSource, source.SVN):
- return
-
- # Compare CheckOutSource.baseURL with SVNMirror (or with the default URL) in config.json for all builders
- for builder in c['builders']:
- for buildStepFactory, kwargs in builder['factory'].steps:
- if str(buildStepFactory).split('.')[-1] == 'CheckOutSource':
- CheckOutSourceInstance = buildStepFactory(**kwargs)
- self.assertEqual(CheckOutSourceInstance.baseURL, self.get_SVNMirrorFromConfig(builder['name']))
-
-
class BuildStepsConstructorTest(unittest.TestCase):
# "Passing a BuildStep subclass to factory.addStep is deprecated. Please pass a BuildStep instance instead. Support will be dropped in v0.8.7."
# It checks if all builder's all buildsteps can be insantiated after migration.
Deleted: trunk/Tools/BuildSlaveSupport/wait-for-SVN-server.py (268593 => 268594)
--- trunk/Tools/BuildSlaveSupport/wait-for-SVN-server.py 2020-10-16 15:52:27 UTC (rev 268593)
+++ trunk/Tools/BuildSlaveSupport/wait-for-SVN-server.py 2020-10-16 16:06:16 UTC (rev 268594)
@@ -1,76 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2006 John Pye
-# Copyright (C) 2012 University of Szeged
-#
-# This script is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-
-from optparse import OptionParser
-import exceptions
-import sys
-import time
-import xml.dom.minidom
-import os
-import subprocess
-
-
-def getLatestSVNRevision(SVNServer):
- p = subprocess.Popen(["svn", "log", "--non-interactive", "--verbose", "--xml", "--limit=1", SVNServer], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- response = p.communicate()[0]
- if p.returncode != 0:
- print("Can't connect to host: %s, return code %s " % (SVNServer, p.returncode))
- print("OUTPUT:")
- print(response)
- return -1
- try:
- doc = xml.dom.minidom.parseString(response)
- el = doc.getElementsByTagName("logentry")[0]
- return el.getAttribute("revision")
- except xml.parsers.expat.ExpatError as e:
- print("FAILED TO PARSE 'svn log' XML:")
- print(str(e))
- print("----")
- print("RECEIVED TEXT:")
- print(response)
- sys.exit(1)
-
-
-def waitForSVNRevision(SVNServer, revision):
- if not revision or not revision.isdigit():
- latestRevision = int(getLatestSVNRevision(SVNServer))
- print("Latest SVN revision on %s is r%d. Don't wait, because revision argument isn't a valid SVN revision." % (SVNServer, latestRevision))
- return
-
- revision = int(revision)
- while True:
- latestRevision = int(getLatestSVNRevision(SVNServer))
- if latestRevision == -1:
- print("%s SVN server is unreachable. Sleeping for 60 seconds." % (SVNServer))
- time.sleep(60)
- elif latestRevision < revision:
- print("Latest SVN revision on %s is r%d, but we are waiting for r%d. Sleeping for 5 seconds." % (SVNServer, latestRevision, revision))
- time.sleep(5)
- else:
- print("Latest SVN revision on %s is r%d, which is newer or equal than r%d." % (SVNServer, latestRevision, revision))
- break
-
-
-if __name__ == '__main__':
- parser = OptionParser()
- parser.add_option("-r", "--revision", dest="revision", help="SVN revision number")
- parser.add_option("-s", "--svn-server", dest="SVNServer", help="SVN server")
- options, args = parser.parse_args()
- waitForSVNRevision(options.SVNServer, options.revision)
Modified: trunk/Tools/ChangeLog (268593 => 268594)
--- trunk/Tools/ChangeLog 2020-10-16 15:52:27 UTC (rev 268593)
+++ trunk/Tools/ChangeLog 2020-10-16 16:06:16 UTC (rev 268594)
@@ -1,3 +1,18 @@
+2020-10-16 Aakash Jain <aakash_j...@apple.com>
+
+ [build.webkit.org] Remove SVNMirror
+ https://bugs.webkit.org/show_bug.cgi?id=217823
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/build.webkit.org-config/factories.py: Removed SVNMirror.
+ * BuildSlaveSupport/build.webkit.org-config/steps.py: Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/loadConfig.py: Ditto.
+ (WaitForSVNServer): Deleted.
+ (WaitForSVNServer.evaluateCommand): Deleted.
+ * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
+ * BuildSlaveSupport/wait-for-SVN-server.py: Removed.
+
2020-10-16 Carlos Alberto Lopez Perez <clo...@igalia.com>
[JHBuild] Update libwpe and wpebackend-fdo and add libmanette to minimal moduleset
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
