Skip to content

Commit

Permalink
Allow building two board packages in artiq-quick.
Browse files Browse the repository at this point in the history
whitequark committed Jan 19, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent f29aeec commit 20f2d26
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -454,17 +454,14 @@ def addFlockReleaseSteps(factory, board):
locks = default_locks))

def addTriggerSteps(factory, builder_names, alwaysUseLatest,
waitForFinish=False,
copy_properties=[], set_properties={}):
waitForFinish=False, **kwargs):
factory.addStep(
Trigger(
schedulerNames = map(lambda name: 'trigger-{}'.format(name),
builder_names),
alwaysUseLatest = alwaysUseLatest,
waitForFinish = waitForFinish,
haltOnFailure = waitForFinish,
copy_properties = copy_properties,
set_properties = set_properties))
haltOnFailure = waitForFinish))

from buildbot.config import BuilderConfig

@@ -641,12 +638,15 @@ addCondaBuildSteps(artiqQuickBuildFactory,
addCondaUploadSteps(artiqQuickBuildFactory,
label='%(channel:-quick)s')
# Build and upload the `artiq-board-*` package
addTriggerSteps(artiqQuickBuildFactory,
builder_names=["artiq-board"],
alwaysUseLatest=False,
waitForFinish=True,
set_properties={"package": WithProperties('artiq-%(board)s'),
"channel": WithProperties('%(channel:-quick)s')})
for var in ["board1", "board2"]:
addTriggerSteps(artiqQuickBuildFactory,
builder_names=["artiq-board"],
alwaysUseLatest=False,
waitForFinish=True,
set_properties={"package": WithProperties('artiq-%(' + var + ')s'),
"channel": WithProperties('%(channel:-quick)s')},
doStepIf=lambda step: step.getProperty(var),
hideStepIf=lambda step, result: result == SKIPPED)

c['builders'].append(
BuilderConfig(

0 comments on commit 20f2d26

Please sign in to comment.