Changeset 268674 in webkit


Ignore:
Timestamp:
Oct 19, 2020, 11:17:18 AM (5 years ago)
Author:
aakash_jain@apple.com
Message:

[build.webkit.org] Use feature flag to support Buildbot 2 code
https://bugs.webkit.org/show_bug.cgi?id=217834

Reviewed by Jonathan Bedard.

  • BuildSlaveSupport/build.webkit.org-config/loadConfig.py:

(loadBuilderConfig):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py

    r268596 r268674  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 from buildbot.buildslave import BuildSlave
     23import os
     24USE_BUILDBOT_VERSION2 = os.getenv('USE_BUILDBOT_VERSION2') is not None
     25
     26if USE_BUILDBOT_VERSION2:
     27    from buildbot.worker import Worker
     28else:
     29    from buildbot.buildslave import BuildSlave
    2430from buildbot.scheduler import AnyBranchScheduler, Triggerable, Nightly
    2531from buildbot.schedulers.forcesched import FixedParameter, ForceScheduler, StringParameter, BooleanParameter
     
    5965
    6066    config = json.load(open('config.json'))
    61     c['slaves'] = [BuildSlave(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
     67    if USE_BUILDBOT_VERSION2:
     68        c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
     69    else:
     70        c['slaves'] = [BuildSlave(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
    6271
    6372    c['schedulers'] = []
     
    100109                break
    101110
    102         builder['slavenames'] = builder.pop('workernames')  # Workaround for old buildbot to allow using workernames in config.json instead of slavenames
     111        if not USE_BUILDBOT_VERSION2:
     112            builder['slavenames'] = builder.pop('workernames')
    103113        platform = builder['platform']
    104114
     
    119129            raise Exception('Builder name "{}" is not a valid buildbot identifier.'.format(builder_name))
    120130        for step in builder["factory"].steps:
    121             step_name = step[0].name
     131            if USE_BUILDBOT_VERSION2:
     132                step_name = step.buildStep().name
     133            else:
     134                step_name = step[0].name
    122135            if len(step_name) > STEP_NAME_LENGTH_LIMIT:
    123136                raise Exception('step name "{}" is longer than maximum allowed by Buildbot ({} characters).'.format(step_name, STEP_NAME_LENGTH_LIMIT))
     
    126139
    127140        if platform.startswith('mac'):
    128             builder["category"] = 'AppleMac'
     141            category = 'AppleMac'
    129142        elif platform.startswith('ios'):
    130             builder['category'] = 'iOS'
     143            category = 'iOS'
    131144        elif platform == 'win':
    132             builder["category"] = 'AppleWin'
     145            category = 'AppleWin'
    133146        elif platform.startswith('gtk'):
    134             builder["category"] = 'GTK'
     147            category = 'GTK'
    135148        elif platform.startswith('wpe'):
    136             builder["category"] = 'WPE'
     149            category = 'WPE'
    137150        elif platform == 'wincairo':
    138             builder["category"] = 'WinCairo'
     151            category = 'WinCairo'
    139152        elif platform.startswith('playstation'):
    140             builder["category"] = 'PlayStation'
     153            category = 'PlayStation'
    141154        else:
    142             builder["category"] = 'misc'
     155            category = 'misc'
    143156
    144         if (builder['category'] in ('AppleMac', 'AppleWin', 'iOS')) and factoryName != 'BuildFactory':
     157        if (category in ('AppleMac', 'AppleWin', 'iOS')) and factoryName != 'BuildFactory':
    145158            builder['nextBuild'] = pickLatestBuild
    146159
     160        if not USE_BUILDBOT_VERSION2:
     161            builder['category'] = category
    147162        c['builders'].append(builder)
    148163
  • TabularUnified trunk/Tools/ChangeLog

    r268673 r268674  
     12020-10-19  Aakash Jain  <aakash_jain@apple.com>
     2
     3        [build.webkit.org] Use feature flag to support Buildbot 2 code
     4        https://bugs.webkit.org/show_bug.cgi?id=217834
     5
     6        Reviewed by Jonathan Bedard.
     7
     8        * BuildSlaveSupport/build.webkit.org-config/loadConfig.py:
     9        (loadBuilderConfig):
     10
    1112020-10-19  Jonathan Bedard  <jbedard@apple.com>
    212
Note: See TracChangeset for help on using the changeset viewer.