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: 37592bf1ab75
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: 83498948f902
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 27, 2017

  1. Only run coredevice tests after flashing.

    We've run everything else already, it's a waste of time to repeat.
    whitequark committed Dec 27, 2017
    Copy the full SHA
    1227867 View commit details
  2. Spend less time trying to ping core device.

    We don't have such severe TCP/IP stack bugs anymore.
    whitequark committed Dec 27, 2017
    Copy the full SHA
    4d246b9 View commit details
  3. Use default options for artiq_flash.

    whitequark committed Dec 27, 2017
    Copy the full SHA
    8349894 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 master.cfg
6 changes: 3 additions & 3 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -437,7 +437,7 @@ def addARTIQFlashSteps(factory, options, address):
factory.addStep(
MasterShellCommand(
name = 'ping',
command = ['ping', address, '-c30', '-w120'],
command = ['ping', address, '-c10', '-w30'],
description = ['pinging', address],
descriptionDone = ['ping', address],
haltOnFailure = True,
@@ -602,10 +602,10 @@ addCondaInstallSteps(artiqBuildFactory,
addFlockAcquireSteps(artiqBuildFactory,
board='kc705')
addARTIQFlashSteps(artiqBuildFactory,
options=['proxy', 'gateware', 'bios', 'runtime', 'start'],
options=[],
address=test_board_hostname)
addPythonCoverageSteps(artiqBuildFactory,
source_path='artiq', test_path='artiq/test',
source_path='artiq', test_path='artiq/test/coredevice',
locks=[low_latency_lock.access('exclusive')],
extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq/examples/master' })
addPythonCoverageCombineSteps(artiqBuildFactory)