Changeset 272681 in webkit


Ignore:
Timestamp:
Feb 10, 2021, 1:06:30 PM (4 years ago)
Author:
aakash_jain@apple.com
Message:

[build.webkit.org] Remove code specific to old Buildbot
​https://bugs.webkit.org/show_bug.cgi?id=221558

Reviewed by Jonathan Bedard.

  • CISupport/build-webkit-org/buildbot.tac:
  • CISupport/build-webkit-org/loadConfig.py:
  • CISupport/build-webkit-org/loadConfig_unittest.py:
  • CISupport/build-webkit-org/master.cfg: Removed.
  • CISupport/build-webkit-org/steps.py:

(TestWithFailureCount.getText): Deleted.
(TestWithFailureCount.getText2): Deleted.
(CompileWebKit.createSummary): Deleted.
(RunWebKitTests._parseRunWebKitTestsOutput): Deleted.
(RunWebKitTests.commandComplete): Deleted.
(RunWebKitTests.getText): Deleted.
(RunWebKitTests.getText2): Deleted.
(ExtractTestResults.start): Deleted.

  • CISupport/ews-build/steps.py:
  • CISupport/ews-build/steps_unittest.py:
Location:
trunk/Tools
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/CISupport/build-webkit-org/buildbot.tac

    r268935 r272681  
    11import os
    2 
    3 USE_BUILDBOT_VERSION2 = os.getenv('USE_BUILDBOT_VERSION2') is not None
    42
    53from twisted.application import service
    … …  
    75
    86basedir = '.'
    9 if USE_BUILDBOT_VERSION2:
    10     configfile = r'master_buildbot2.cfg'
    11 else:
    12     configfile = r'master.cfg'
     7configfile = r'master_buildbot2.cfg'
    138rotateLength = 50000000
    149maxRotatedFiles = 20

  • trunk/Tools/CISupport/build-webkit-org/loadConfig.py

    r271406 r272681  
    2222
    2323import os
    24 USE_BUILDBOT_VERSION2 = os.getenv('USE_BUILDBOT_VERSION2') is not None
    2524
    26 if USE_BUILDBOT_VERSION2:
    27     from buildbot.worker import Worker
    28 else:
    29     from buildbot.buildslave import BuildSlave
     25from buildbot.worker import Worker
    3026from buildbot.scheduler import AnyBranchScheduler, Triggerable, Nightly
    3127from buildbot.schedulers.forcesched import FixedParameter, ForceScheduler, StringParameter, BooleanParameter
    … …  
    6359
    6460    config = json.load(open('config.json'))
    65     if USE_BUILDBOT_VERSION2:
    66         c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
    67     else:
    68         c['slaves'] = [BuildSlave(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
     61    c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
    6962
    7063    c['schedulers'] = []
    … …  
    8073    reason = StringParameter(name='reason', default='', size=40)
    8174    properties = [BooleanParameter(name='is_clean', label='Force Clean build')]
    82     if USE_BUILDBOT_VERSION2:
    83         forceScheduler = ForceScheduler(name='force', builderNames=builderNames, reason=reason, properties=properties)
    84     else:
    85         forceScheduler = ForceScheduler(
    86             name='force',
    87             builderNames=builderNames,
    88             reason=reason,
    89 
    90             # Validate SVN revision: number or empty string
    91             revision=StringParameter(name="revision", default="", regex=re.compile(r'^(\d*)$')),
    92 
    93             # Disable default enabled input fields: branch, repository, project, additional properties
    94             branch=FixedParameter(name="branch"),
    95             repository=FixedParameter(name="repository"),
    96             project=FixedParameter(name="project"),
    97             properties=properties
    98         )
     75    forceScheduler = ForceScheduler(name='force', builderNames=builderNames, reason=reason, properties=properties)
    9976    c['schedulers'].append(forceScheduler)
    10077
    … …  
    11087                break
    11188
    112         if not USE_BUILDBOT_VERSION2:
    113             builder['slavenames'] = builder.pop('workernames')
    11489        platform = builder['platform']
    11590
    … …  
    130105            raise Exception('Builder name "{}" is not a valid buildbot identifier.'.format(builder_name))
    131106        for step in builder["factory"].steps:
    132             if USE_BUILDBOT_VERSION2:
    133                 step_name = step.buildStep().name
    134             else:
    135                 step_name = step[0].name
     107            step_name = step.buildStep().name
    136108            if len(step_name) > STEP_NAME_LENGTH_LIMIT:
    137109                raise Exception('step name "{}" is longer than maximum allowed by Buildbot ({} characters).'.format(step_name, STEP_NAME_LENGTH_LIMIT))
    … …  
    159131            builder['nextBuild'] = pickLatestBuild
    160132
    161         if USE_BUILDBOT_VERSION2:
    162             builder['tags'] = getTagsForBuilder(builder)
    163         else:
    164             builder['category'] = category
     133        builder['tags'] = getTagsForBuilder(builder)
    165134        c['builders'].append(builder)
    166135

  • trunk/Tools/CISupport/build-webkit-org/loadConfig_unittest.py

    r270354 r272681  
    2828import unittest
    2929
    30 USE_BUILDBOT_VERSION2 = os.getenv('USE_BUILDBOT_VERSION2') is not None
    31 if USE_BUILDBOT_VERSION2:
    32     import loadConfig
     30import loadConfig
    3331
    3432class ConfigDotJSONTest(unittest.TestCase):

  • trunk/Tools/CISupport/build-webkit-org/steps.py

    r272398 r272681  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 from buildbot.process import buildstep, factory, properties
     23from buildbot.process import buildstep, factory, logobserver, properties
     24from buildbot.process.results import Results
    2425from buildbot.steps import master, shell, transfer, trigger
     26from buildbot.steps.source.svn import SVN
    2527from buildbot.status.builder import SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION
    2628
    … …  
    4042S3URL = 'https://s3-us-west-2.amazonaws.com/'
    4143S3_RESULTS_URL = '{}build.webkit.org-results/'.format(S3URL)
    42 USE_BUILDBOT_VERSION2 = os.getenv('USE_BUILDBOT_VERSION2') is not None
    4344WithProperties = properties.WithProperties
    44 if USE_BUILDBOT_VERSION2:
    45     Interpolate = properties.Interpolate
    46     from buildbot.process import logobserver
    47     from buildbot.process.results import Results
    48     from buildbot.steps.source.svn import SVN
    49 else:
    50     import cStringIO
    51     from buildbot.steps.source import SVN
    52     logobserver = lambda: None
    53     logobserver.LineConsumerLogObserver = type('LineConsumerLogObserver', (object,), {})
     45Interpolate = properties.Interpolate
    5446
    5547
    … …  
    9284
    9385        return SUCCESS
    94 
    95     def getText(self, cmd, results):
    96         # FIXME: delete this method after switching to Buildbot v2
    97         return self.getText2(cmd, results)
    98 
    99     def getText2(self, cmd, results):
    100         # FIXME: delete this method after switching to Buildbot v2
    101         if results != SUCCESS and self.failedTestCount:
    102             return [self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)]
    103 
    104         return [self.name]
    10586
    10687    def getResultSummary(self):
    … …  
    132113        self.additionalArguments = additionalArguments
    133114        self.device_model = device_model
    134         if not USE_BUILDBOT_VERSION2:
    135             self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, additionalArguments=additionalArguments, device_model=device_model)
    136115
    137116    def start(self):
    … …  
    152131class CheckOutSource(SVN, object):
    153132    def __init__(self, **kwargs):
    154         if USE_BUILDBOT_VERSION2:
    155             kwargs['repourl'] = 'https://svn.webkit.org/repository/webkit/trunk'
    156             kwargs['mode'] = 'incremental'
    157         else:
    158             kwargs['baseURL'] = "https://svn.webkit.org/repository/webkit/"
    159             kwargs['defaultBranch'] = "trunk"
    160             kwargs['mode'] = 'update'
     133        kwargs['repourl'] = 'https://svn.webkit.org/repository/webkit/trunk'
     134        kwargs['mode'] = 'incremental'
    161135        super(CheckOutSource, self).__init__(**kwargs)
    162136
    … …  
    275249        additionalArguments = self.getProperty('additionalArguments')
    276250
    277         if USE_BUILDBOT_VERSION2:
    278             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    279             self.addLogObserver('stdio', self.log_observer)
     251        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     252        self.addLogObserver('stdio', self.log_observer)
    280253
    281254        if additionalArguments:
    … …  
    310283        log.addStdout(message)
    311284
    312     def createSummary(self, log):
    313         # FIXME: delete this method after switching to Buildbot v2
    314         if USE_BUILDBOT_VERSION2:
    315             return
    316         platform = self.getProperty('platform')
    317         if platform.startswith('mac'):
    318             warnings = []
    319             errors = []
    320             sio = cStringIO.StringIO(log.getText())
    321             for line in sio.readlines():
    322                 if "arning:" in line:
    323                     warnings.append(line)
    324                 if "rror:" in line:
    325                     errors.append(line)
    326             if warnings:
    327                 self.addCompleteLog('warnings', "".join(warnings))
    328             if errors:
    329                 self.addCompleteLog('errors', "".join(errors))
    330 
    331285
    332286class CompileLLINTCLoop(CompileWebKit):
    … …  
    393347
    394348    def __init__(self, **kwargs):
    395         if USE_BUILDBOT_VERSION2:
    396             kwargs['workersrc'] = self.workersrc
    397         else:
    398             kwargs['slavesrc'] = self.workersrc
     349        kwargs['workersrc'] = self.workersrc
    399350        kwargs['masterdest'] = self.masterdest
    400351        kwargs['mode'] = 0o644
    … …  
    420371    def start(self):
    421372        if 'apple' in self.getProperty('buildername').lower():
    422             if USE_BUILDBOT_VERSION2:
    423                 self.workerEnvironment['HTTPS_PROXY'] = APPLE_WEBKIT_AWS_PROXY  # curl env var to use a proxy
    424             else:
    425                 self.slaveEnvironment['HTTPS_PROXY'] = APPLE_WEBKIT_AWS_PROXY  # curl env var to use a proxy
     373            self.workerEnvironment['HTTPS_PROXY'] = APPLE_WEBKIT_AWS_PROXY  # curl env var to use a proxy
    426374        return shell.ShellCommand.start(self)
    427375
    428376    def evaluateCommand(self, cmd):
    429377        rc = shell.ShellCommand.evaluateCommand(self, cmd)
    430         if rc == FAILURE and USE_BUILDBOT_VERSION2:
     378        if rc == FAILURE:
    431379            self.build.addStepsAfterCurrentStep([DownloadBuiltProductFromMaster()])
    432380        return rc
    … …  
    481429
    482430    def start(self):
    483         if USE_BUILDBOT_VERSION2:
    484             self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    485         else:
    486             self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     431        self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    487432        platform = self.getProperty('platform')
    488433        architecture = self.getProperty("architecture")
    … …  
    529474
    530475    def start(self):
    531         if USE_BUILDBOT_VERSION2:
    532             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    533             self.addLogObserver('stdio', self.log_observer)
    534             self.failedTestCount = 0
     476        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     477        self.addLogObserver('stdio', self.log_observer)
     478        self.failedTestCount = 0
    535479        appendCustomBuildFlags(self, self.getProperty('platform'), self.getProperty('fullPlatform'))
    536480        return shell.Test.start(self)
    … …  
    542486
    543487    def countFailures(self, cmd):
    544         if USE_BUILDBOT_VERSION2:
    545             return self.failedTestCount
    546 
    547         logText = cmd.logs['stdio'].getText()
    548         matches = re.findall(r'^\! NEW FAIL', logText, flags=re.MULTILINE)
    549         if matches:
    550             return len(matches)
    551         return 0
     488        return self.failedTestCount
    552489
    553490
    … …  
    586523
    587524    def start(self):
    588         if USE_BUILDBOT_VERSION2:
    589             self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    590             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    591             self.addLogObserver('stdio', self.log_observer)
    592             self.incorrectLayoutLines = []
    593             self.testFailures = {}
    594         else:
    595             self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     525        self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     526        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     527        self.addLogObserver('stdio', self.log_observer)
     528        self.incorrectLayoutLines = []
     529        self.testFailures = {}
    596530
    597531        platform = self.getProperty('platform')
    … …  
    615549        return line
    616550
    617     def _parseRunWebKitTestsOutput(self, logText):
    618         # FIXME: delete this method after switching to Buildbot v2
    619         incorrectLayoutLines = []
    620         testFailures = {}
    621 
    622         for line in logText.splitlines():
    623             if line.find('Exiting early') >= 0 or line.find('leaks found') >= 0:
    624                 incorrectLayoutLines.append(self._strip_python_logging_prefix(line))
    625                 continue
    626             for name, expression in self.expressions:
    627                 match = expression.search(line)
    628 
    629                 if match:
    630                     testFailures[name] = testFailures.get(name, 0) + int(match.group(1))
    631                     break
    632 
    633                 # FIXME: Parse file names and put them in results
    634 
    635         for name in testFailures:
    636             incorrectLayoutLines.append(str(testFailures[name]) + ' ' + name)
    637 
    638         self.incorrectLayoutLines = incorrectLayoutLines
    639 
    640551    def parseOutputLine(self, line):
    641552        if r'Exiting early' in line or r'leaks found' in line:
    … …  
    652563            self.incorrectLayoutLines.append(str(result) + ' ' + name)
    653564
    654     def commandComplete(self, cmd):
    655         # FIXME: delete this method after switching to Buildbot v2
    656         shell.Test.commandComplete(self, cmd)
    657 
    658         if not USE_BUILDBOT_VERSION2:
    659             logText = cmd.logs['stdio'].getText()
    660             self._parseRunWebKitTestsOutput(logText)
    661 
    662565    def evaluateCommand(self, cmd):
    663         if USE_BUILDBOT_VERSION2:
    664             self.processTestFailures()
    665 
     566        self.processTestFailures()
    666567        result = SUCCESS
    667568
    … …  
    695596            return {'step': status}
    696597        return super(RunWebKitTests, self).getResultSummary()
    697 
    698     def getText(self, cmd, results):
    699         # FIXME: delete this method after switching to Buildbot v2
    700         return self.getText2(cmd, results)
    701 
    702     def getText2(self, cmd, results):
    703         # FIXME: delete this method after switching to Buildbot v2
    704         if results != SUCCESS and self.incorrectLayoutLines:
    705             return self.incorrectLayoutLines
    706 
    707         return [self.name]
    708598
    709599
    … …  
    746636
    747637    def start(self):
    748         if USE_BUILDBOT_VERSION2:
    749             self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    750             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    751             self.addLogObserver('stdio', self.log_observer)
    752             self.failedTestCount = 0
    753         else:
    754             self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     638        self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     639        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     640        self.addLogObserver('stdio', self.log_observer)
     641        self.failedTestCount = 0
    755642        appendCustomTestingFlags(self, self.getProperty('platform'), self.getProperty('device_model'))
    756643        return shell.Test.start(self)
    757644
    758645    def countFailures(self, cmd):
    759         if USE_BUILDBOT_VERSION2:
    760             return self.failedTestCount
    761 
    762         log_text = cmd.logs['stdio'].getText()
    763 
    764         match = re.search(r'Ran (?P<ran>\d+) tests of (?P<total>\d+) with (?P<passed>\d+) successful', log_text)
    765         if not match:
    766             return -1
    767         return int(match.group('ran')) - int(match.group('passed'))
     646        return self.failedTestCount
    768647
    769648    def parseOutputLine(self, line):
    … …  
    777656
    778657    def start(self):
    779         if USE_BUILDBOT_VERSION2:
    780             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    781             self.addLogObserver('stdio', self.log_observer)
    782             self.failedTestCount = 0
     658        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     659        self.addLogObserver('stdio', self.log_observer)
     660        self.failedTestCount = 0
    783661        platform = self.getProperty('platform')
    784662        # Python tests are flaky on the GTK builders, running them serially
    … …  
    798676
    799677    def countFailures(self, cmd):
    800         if USE_BUILDBOT_VERSION2:
    801             return self.failedTestCount
    802 
    803         logText = cmd.logs['stdio'].getText()
    804         # We're looking for the line that looks like this: FAILED (failures=2, errors=1)
    805         regex = re.compile(r'^FAILED \((?P<counts>[^)]+)\)')
    806         for line in logText.splitlines():
    807             match = regex.match(line)
    808             if not match:
    809                 continue
    810             return sum(int(component.split('=')[1]) for component in match.group('counts').split(', '))
    811         return 0
     678        return self.failedTestCount
    812679
    813680
    … …  
    833700
    834701    def start(self):
    835         if USE_BUILDBOT_VERSION2:
    836             self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    837         else:
    838             self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     702        self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    839703        return RunPythonTests.start(self)
    840704
    … …  
    863727
    864728    def start(self):
    865         if USE_BUILDBOT_VERSION2:
    866             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    867             self.addLogObserver('stdio', self.log_observer)
    868             self.failedTestCount = 0
     729        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     730        self.addLogObserver('stdio', self.log_observer)
     731        self.failedTestCount = 0
    869732        return shell.Test.start(self)
    870733
    … …  
    875738
    876739    def countFailures(self, cmd):
    877         if USE_BUILDBOT_VERSION2:
    878             return self.failedTestCount
    879 
    880         logText = cmd.logs['stdio'].getText()
    881         # We're looking for the line that looks like this: Failed 2/19 test programs. 5/363 subtests failed.
    882         regex = re.compile(r'^Failed \d+/\d+ test programs\. (?P<count>\d+)/\d+ subtests failed\.')
    883         for line in logText.splitlines():
    884             match = regex.match(line)
    885             if not match:
    886                 continue
    887             return int(match.group('count'))
    888         return 0
     740        return self.failedTestCount
    889741
    890742
    … …  
    915767
    916768    def start(self):
    917         if USE_BUILDBOT_VERSION2:
    918             self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    919             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    920             self.addLogObserver('stdio', self.log_observer)
    921             self.failedTestCount = 0
    922         else:
    923             self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     769        self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     770        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     771        self.addLogObserver('stdio', self.log_observer)
     772        self.failedTestCount = 0
    924773        return shell.Test.start(self)
    925774
    … …  
    930779
    931780    def countFailures(self, cmd):
    932         if USE_BUILDBOT_VERSION2:
    933             return self.failedTestCount
    934 
    935         logText = cmd.logs['stdio'].getText()
    936         # We're looking for the line that looks like this: 0 regressions found.
    937         regex = re.compile(r'\s*(?P<count>\d+) regressions? found.')
    938         for line in logText.splitlines():
    939             match = regex.match(line)
    940             if not match:
    941                 continue
    942             return int(match.group('count'))
    943         return 0
     781        return self.failedTestCount
    944782
    945783
    … …  
    970808
    971809    def start(self):
    972         if USE_BUILDBOT_VERSION2:
    973             self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    974             self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
    975             self.addLogObserver('stdio', self.log_observer)
    976             self.failedTestCount = 0
    977         else:
    978             self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     810        self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     811        self.log_observer = ParseByLineLogObserver(self.parseOutputLine)
     812        self.addLogObserver('stdio', self.log_observer)
     813        self.failedTestCount = 0
    979814        return shell.Test.start(self)
    980815
    … …  
    985820
    986821    def countFailures(self, cmd):
    987         if USE_BUILDBOT_VERSION2:
    988             return self.failedTestCount
    989 
    990         logText = cmd.logs['stdio'].getText()
    991         # We're looking for the line that looks like this: 0 failures found.
    992         regex = re.compile(r'\s*(?P<count>\d+) failures? found.')
    993         for line in logText.splitlines():
    994             match = regex.match(line)
    995             if not match:
    996                 continue
    997             return int(match.group('count'))
    998         return 0
     822        return self.failedTestCount
    999823
    1000824
    … …  
    12441068
    12451069    def __init__(self, **kwargs):
    1246         if USE_BUILDBOT_VERSION2:
    1247             kwargs['workersrc'] = self.workersrc
    1248         else:
    1249             kwargs['slavesrc'] = self.workersrc
     1070        kwargs['workersrc'] = self.workersrc
    12501071        kwargs['masterdest'] = self.masterdest
    12511072        kwargs['mode'] = 0o644
    … …  
    12621083    identifier = WithProperties("%(fullPlatform)s-%(architecture)s-%(configuration)s")
    12631084    revision = WithProperties("%(got_revision)s")
    1264     command = ["python", "../Shared/transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
     1085    command = ["python3", "../Shared/transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
    12651086    haltOnFailure = True
    12661087
    12671088    def __init__(self, **kwargs):
    12681089        kwargs['command'] = self.command
    1269         if USE_BUILDBOT_VERSION2:
    1270             kwargs['logEnviron'] = False
     1090        kwargs['logEnviron'] = False
    12711091        master.MasterShellCommand.__init__(self, **kwargs)
    12721092
    12731093    def start(self):
    1274         if USE_BUILDBOT_VERSION2:
    1275             self.command[0] = 'python3'
    12761094        return master.MasterShellCommand.start(self)
    12771095
    … …  
    12861104    name = 'extract-test-results'
    12871105    descriptionDone = ['Extracted test results']
    1288     if USE_BUILDBOT_VERSION2:
    1289         renderables = ['resultDirectory', 'zipFile']
     1106    renderables = ['resultDirectory', 'zipFile']
    12901107
    12911108    def __init__(self, **kwargs):
    12921109        kwargs['command'] = ""
    1293         if USE_BUILDBOT_VERSION2:
    1294             kwargs['logEnviron'] = False
    1295             self.zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:got_revision)s (%(prop:buildnumber)s).zip')
    1296             self.resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:got_revision)s (%(prop:buildnumber)s)')
    1297             kwargs['command'] = ['echo', 'Unzipping in background, it might take a while.']
     1110        kwargs['logEnviron'] = False
     1111        self.zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:got_revision)s (%(prop:buildnumber)s).zip')
     1112        self.resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:got_revision)s (%(prop:buildnumber)s)')
     1113        kwargs['command'] = ['echo', 'Unzipping in background, it might take a while.']
    12981114        master.MasterShellCommand.__init__(self, **kwargs)
    12991115
    13001116    def resultDirectoryURL(self):
    1301         if USE_BUILDBOT_VERSION2:
    1302             path = self.resultDirectory.replace('public_html/results/', '') + '/'
    1303             return '{}{}'.format(S3_RESULTS_URL, path)
    1304         else:
    1305             return self.build.getProperties().render(self.resultDirectory).replace('public_html/', '/') + '/'
    1306 
    1307     def start(self):
    1308         if not USE_BUILDBOT_VERSION2:
    1309             self.zipFile = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip")
    1310             self.resultDirectory = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s)")
    1311             self.zipFile = self.build.getProperties().render(self.zipFile)
    1312             self.resultDirectory = self.build.getProperties().render(self.resultDirectory)
    1313             self.command = ['unzip', '-q', '-o', self.zipFile, '-d', self.resultDirectory]
    1314         return master.MasterShellCommand.start(self)
     1117        path = self.resultDirectory.replace('public_html/results/', '') + '/'
     1118        return '{}{}'.format(S3_RESULTS_URL, path)
    13151119
    13161120    def addCustomURLs(self):

  • trunk/Tools/CISupport/ews-build/steps.py

    r272664 r272681  
    12061206
    12071207    def start(self):
    1208         self.workerEnvironment['USE_BUILDBOT_VERSION2'] = 'True'
    12091208        return shell.ShellCommand.start(self)
    12101209

  • trunk/Tools/CISupport/ews-build/steps_unittest.py

    r272664 r272681  
    739739                        logEnviron=False,
    740740                        command=['python3', 'runUnittests.py', 'build-webkit-org'],
    741                         env={'USE_BUILDBOT_VERSION2': 'True'},
    742741                        )
    743742            + 0,
    … …  
    753752                        logEnviron=False,
    754753                        command=['python3', 'runUnittests.py', 'build-webkit-org'],
    755                         env={'USE_BUILDBOT_VERSION2': 'True'},
    756754                        )
    757755            + ExpectShell.log('stdio', stdout='Unhandled Error. Traceback (most recent call last): Keys in cmd missing from expectation: [logfiles.json]')

  • trunk/Tools/ChangeLog

    r272669 r272681  
     12021-02-10  Aakash Jain  <aakash_jain@apple.com>
     2
     3        [build.webkit.org] Remove code specific to old Buildbot
     4        https://bugs.webkit.org/show_bug.cgi?id=221558
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        * CISupport/build-webkit-org/buildbot.tac:
     9        * CISupport/build-webkit-org/loadConfig.py:
     10        * CISupport/build-webkit-org/loadConfig_unittest.py:
     11        * CISupport/build-webkit-org/master.cfg: Removed.
     12        * CISupport/build-webkit-org/steps.py:
     13        (TestWithFailureCount.getText): Deleted.
     14        (TestWithFailureCount.getText2): Deleted.
     15        (CompileWebKit.createSummary): Deleted.
     16        (RunWebKitTests._parseRunWebKitTestsOutput): Deleted.
     17        (RunWebKitTests.commandComplete): Deleted.
     18        (RunWebKitTests.getText): Deleted.
     19        (RunWebKitTests.getText2): Deleted.
     20        (ExtractTestResults.start): Deleted.
     21        * CISupport/ews-build/steps.py:
     22        * CISupport/ews-build/steps_unittest.py:
     23
    1242021-02-10  Wenson Hsieh  <wenson_hsieh@apple.com>
    225
Note: See TracChangeset for help on using the changeset viewer.