Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/buildbot-config
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1623ea51cbe5
Choose a base ref
...
head repository: m-labs/buildbot-config
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4fa29a7f5589
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2018

  1. Update lockfile paths.

    whitequark committed Jan 19, 2018
    Copy the full SHA
    824acd9 View commit details

  2. Force installation of the board package with the newly built version.

    whitequark committed Jan 19, 2018
    Copy the full SHA
    4fa29a7 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 master.cfg
6 changes: 3 additions & 3 deletions master.cfg
View file
Original file line number Diff line number Diff line change
@@ -459,15 +459,15 @@ def addFlockAcquireSteps(factory, board):
factory.addStep(
FlockStep(
name = 'board_lock',
filename = '/run/boards/{}'.format(board),
filename = '/var/lib/artiq/boards/{}'.format(board),
haltOnFailure = True,
locks = default_locks))

def addFlockReleaseSteps(factory, board):
factory.addStep(
FunlockStep(
name = 'board_unlock',
filename = '/run/boards/{}'.format(board),
filename = '/var/lib/artiq/boards/{}'.format(board),
hideStepIf = lambda result, step: result == SKIPPED,
locks = default_locks))

@@ -598,7 +598,7 @@ addTriggerSteps(artiqBuildFactory,
set_properties={"package": test_board_package})
# Test ARTIQ with hardware in the loop
addCondaInstallSteps(artiqBuildFactory,
packages=[test_board_package])
packages=[test_board_package + "=%(output_version)s"])
addFlockAcquireSteps(artiqBuildFactory,
board='kc705-1')
addARTIQFlashSteps(artiqBuildFactory,