Ticket #52742: variants-master.cfg.2.diff

File variants-master.cfg.2.diff, 2.4 KB (added by mojca (Mojca Miklavec), 8 years ago)

add a field to support variants

  • buildbot/master.cfg

    a b c['schedulers'] = [ 
    220220    schedulers.ForceScheduler(
    221221        name='portwatcher_force',
    222222        builderNames=portwatcher_buildernames,
    223         properties=[util.StringParameter(
    224             name='portlist',
    225             label='Port list:',
    226             default='',
    227             size=30,
    228             required=True)])
     223        properties=[
     224            util.StringParameter(
     225                name='portlist',
     226                label='Port list:',
     227                default='',
     228                size=30,
     229                required=True),
     230            util.StringParameter(
     231                name='variants',
     232                label='Variants:',
     233                default='',
     234                size=30,
     235                required=False)])
    229236    ]
    230237
    231238
    … … class TriggerWithPortlist(steps.Trigger): 
    369376            for port in self.build.getProperty('subportlist').split():
    370377                props = self.set_properties.copy()
    371378                props['portname'] = port
     379                props['variants'] = self.build.getProperty('variants')
    372380                sp.append([scheduler, props])
    373381        return sp
    374382
    … … portbuilder_factory.workdir = '../build' 
    459467logdir = os.path.join(portbuilder_factory.workdir, 'logs')
    460468
    461469portbuilder_factory.addStep(steps.Compile(
    462     command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-dependencies', util.WithProperties('%(portname)s')],
     470    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-dependencies', util.WithProperties('%(portname)s'), util.WithProperties('%(variants)s')],
    463471    name='install-dependencies',
    464472    description=['installing', 'dependencies', 'of', util.WithProperties('%(portname)s')],
    465473    descriptionDone=['install', 'dependencies', 'of', util.WithProperties('%(portname)s')],
    … … portbuilder_factory.addStep(steps.Compile( 
    467475    haltOnFailure=True))
    468476
    469477portbuilder_factory.addStep(steps.Compile(
    470     command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-port', util.WithProperties('%(portname)s')],
     478    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-port', util.WithProperties('%(portname)s'), util.WithProperties('%(variants)s')],
    471479    name='install-port',
    472480    description=['installing', util.WithProperties('%(portname)s')],
    473481    descriptionDone=['install', util.WithProperties('%(portname)s')],