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: 2b0e0d8a7ecb
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: 784612eb4784
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 8, 2018

  1. Copy the full SHA
    cb01f71 View commit details
  2. style

    sbourdeauducq committed Aug 8, 2018
    Copy the full SHA
    784612e View commit details
Showing with 10 additions and 16 deletions.
  1. +10 −16 master.cfg
26 changes: 10 additions & 16 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -387,7 +387,7 @@ def addARTIQFlashSteps(factory, board, domain, options=[]):

factory.addStep(
ShellCommand(
name = 'artiq_corelog',
name = 'set_log_level_legacy',
command = ['artiq_corelog', 'set_level', 'INFO'],
description = ['setting', 'log level'],
descriptionDone = ['set', 'log level'],
@@ -437,20 +437,6 @@ c['validation'] = {
'property_value' : re.compile(r'^[\w\.\-\/\~=+:]*$'),
}

####### PYQTGRAPH

pyqtgraphBuildFactory = BuildFactory()
addCondaBuildSteps(pyqtgraphBuildFactory,
project='pyqtgraph', package='pyqtgraph')
addCondaUploadSteps(pyqtgraphBuildFactory,
force=True, label='dev')

c['builders'].append(
BuilderConfig(
name = 'pyqtgraph',
slavenames = buildslaves['debian-stretch-amd64'],
nextSlave = nextSlave,
factory = pyqtgraphBuildFactory))

####### MIGEN
# apt-get install verilator
@@ -512,14 +498,17 @@ test_variant = 'nist_clock'
#------ artiq

artiqBuildFactory = BuildFactory()

# Build and upload the `artiq-dev` package
addCondaBuildSteps(artiqBuildFactory,
project='artiq', package='artiq-dev')
addCondaUploadSteps(artiqBuildFactory,
force=True, label='dev')

# Build the `artiq` package
addCondaBuildSteps(artiqBuildFactory,
project='artiq', package='artiq', test=False)

# Test the `artiq` package
addCondaSetupTestEnvironmentSteps(artiqBuildFactory,
packages=['artiq=%(output_version)s', 'artiq-dev=%(output_version)s'])
@@ -530,9 +519,11 @@ addPythonUnittestSteps(artiqBuildFactory,
addLitSteps(artiqBuildFactory,
test_path='artiq/test/lit',
extra_vars={ 'PYTHONPATH': '.' })

# Upload the `artiq` package
addCondaUploadSteps(artiqBuildFactory,
force=True, label='dev')

# Build and upload ARTIQ documentation
addSphinxDocumentSteps(artiqBuildFactory,
source_path='doc/manual',
@@ -543,6 +534,7 @@ addSFTPUploadSteps(artiqBuildFactory,
username=secrets['sftp']['username'],
password=secrets['sftp']['password'],
target_path=WithProperties('artiq/manual-%(branch:~master)s'))

# Build and upload the `artiq-board-*` packages
addTriggerSteps(artiqBuildFactory,
builder_names=["artiq-board"],
@@ -559,6 +551,7 @@ addTriggerSteps(artiqBuildFactory,
"artiq_target": "kasli",
"artiq_variant": "tester"},
doStepIf=lambda step: step.getProperty("branch") != "release-3")

# Test ARTIQ with hardware in the loop
addCondaInstallSteps(artiqBuildFactory,
packages=["artiq-" + test_target + "-" + test_variant + "=%(output_version)s"])
@@ -580,6 +573,7 @@ addTriggerSteps(artiqBuildFactory,
'conda_version': WithProperties('%(output_version)s=%(output_build)s')})
addFlockReleaseSteps(artiqBuildFactory,
board=test_board)

# Teardown
addCondaTeardownTestEnvironmentSteps(artiqBuildFactory)

@@ -742,7 +736,7 @@ for builder in c['builders']:
name = 'trigger-{}'.format(builder.name),
builderNames = [builder.name]))

for project in ['pyqtgraph', 'misoc', 'migen', 'artiq']:
for project in ['misoc', 'migen', 'artiq']:
c['schedulers'].append(
AnyBranchScheduler(
name = project,