Changeset 268594 in webkit


Ignore:
Timestamp:
Oct 16, 2020 9:06:16 AM (3 years ago)
Author:
aakash_jain@apple.com
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.
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.
    22#
    33# Redistribution and use in source and binary forms, with or without
     
    2828
    2929class 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):
    3131        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())
    3634        if not (platform == "jsc-only"):
    3735            self.addStep(KillOldProcesses())
     
    5048    ShouldRunMiniBrowserBundleStep = False
    5149
    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)
    5452
    5553        if platform == "win" or platform.startswith("playstation"):
     
    8179        self.addStep(ExtractBuiltProduct())
    8280
    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)
    8583        self.getProduct()
    8684
     
    129127        self.addStep(CompileWebKit())
    130128
    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)
    133131        if triggers:
    134132            self.addStep(ArchiveBuiltProduct())
     
    138136
    139137class 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)
    142140        self.addStep(CompileLLINTCLoop())
    143141        self.addStep(RunLLINTCLoopTests())
     
    145143
    146144class 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)
    149147        self.addStep(Compile32bitJSC())
    150148        self.addStep(Run32bitJSCTests())
     
    156154
    157155class 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)
    160158        self.addStep(CompileJSCOnly(timeout=60 * 60))
    161159        self.addStep(RunRemoteJavaScriptCoreTests(timeout=60 * 60))
     
    163161
    164162class 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)
    167165        self.addStep(DownloadBuiltProduct())
    168166        self.addStep(ExtractBuiltProduct())
     
    191189
    192190class 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)
    195193        self.addStep(DownloadBuiltProduct())
    196194        self.addStep(ExtractBuiltProduct())
     
    199197
    200198class 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)
    203201        self.addStep(DownloadBuiltProduct())
    204202        self.addStep(ExtractBuiltProduct())
     
    207205
    208206class 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)
    211209        self.addStep(DownloadBuiltProduct())
    212210        self.addStep(ExtractBuiltProduct())
     
    216214
    217215class 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)
    220218        self.addStep(DownloadBuiltProduct())
    221219        self.addStep(ExtractBuiltProduct())
     
    232230
    233231class 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)
    236234        self.addStep(CompileWebKit())
    237235        self.addStep(RunAndUploadPerfTests())
     
    241239
    242240class 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)
    245243        self.addStep(DownloadBuiltProduct())
    246244        self.addStep(ExtractBuiltProduct())
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py

    r268429 r268594  
    106106        factory = globals()[factoryName]
    107107        factorykwargs = {}
    108         for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", "SVNMirror", "device_model":
     108        for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", "device_model":
    109109            value = builder.pop(key, None)
    110110            if value:
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py

    r268496 r268594  
    7777    descriptionDone = ["configured build"]
    7878
    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):
    8080        buildstep.BuildStep.__init__(self, *args, **kwargs)
    8181        self.platform = platform
     
    8787        self.buildOnly = buildOnly
    8888        self.additionalArguments = additionalArguments
    89         self.SVNMirror = SVNMirror
    9089        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)
    9291
    9392    def start(self):
     
    9897        self.setProperty("buildOnly", self.buildOnly)
    9998        self.setProperty("additionalArguments", self.additionalArguments)
    100         self.setProperty("SVNMirror", self.SVNMirror)
    10199        self.setProperty("device_model", self.device_model)
    102100        self.finished(SUCCESS)
     
    107105    mode = "update"
    108106
    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/"
    111109        kwargs['defaultBranch'] = "trunk"
    112110        kwargs['mode'] = self.mode
    113111        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 = True
    123 
    124     def evaluateCommand(self, cmd):
    125         if cmd.rc != 0:
    126             return WARNINGS
    127         return SUCCESS
    128112
    129113
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py

    r268496 r268594  
    466466Testing completed, Exit status: 3
    467467""")
    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 = None
    476         for builder in self.config['builders']:
    477             if builder['name'] == builderName:
    478                 SVNMirror = builder.pop('SVNMirror', 'https://svn.webkit.org/repository/webkit/')
    479         return SVNMirror
    480 
    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=85887
    484         if issubclass(CheckOutSource, source.SVN):
    485             return
    486 
    487         # Compare CheckOutSource.baseURL with SVNMirror (or with the default URL) in config.json for all builders
    488         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']))
    493468
    494469
  • trunk/Tools/ChangeLog

    r268591 r268594  
     12020-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
    1162020-10-16  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    217
Note: See TracChangeset for help on using the changeset viewer.