Skip to content

Commit

Permalink
fix board locking separation
Browse files Browse the repository at this point in the history
sbourdeauducq committed Nov 15, 2018
1 parent 0eded5c commit 5aadf58
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -418,7 +418,8 @@ def addARTIQFlashSteps(factory, target, variant, board, domain, options=[]):
def addFlockAcquireSteps(factory, board, **kwargs):
factory.addStep(
FlockStep(
name = 'board_lock',
name = 'board_lock_{}'.format(board),
fdProp = 'flock_fd_{}'.format(board),
filename = '/var/lib/artiq/boards/{}'.format(board),
haltOnFailure = True,
locks = default_locks,
@@ -427,7 +428,8 @@ def addFlockAcquireSteps(factory, board, **kwargs):
def addFlockReleaseSteps(factory, board, **kwargs):
factory.addStep(
FunlockStep(
name = 'board_unlock',
name = 'board_unlock_{}'.format(board),
fdProp = 'flock_fd_{}'.format(board),
filename = '/var/lib/artiq/boards/{}'.format(board),
hideStepIf = lambda result, step: result == SKIPPED,
locks = default_locks,

0 comments on commit 5aadf58

Please sign in to comment.