Use --preinit-command when flashing the test board.

m-labs · Jan 27, 2018 · a00c088 · a00c088
1 parent 3d07995
commit a00c088
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/master.cfg b/master.cfg
@@ -400,7 +400,10 @@ def addCoverallsUploadSteps(factory, repo_token):
             }),
             locks             = default_locks))
 
-def addARTIQFlashSteps(factory, options, address):
+def addARTIQFlashSteps(factory, board, domain, options):
+    address = '{}.{}'.format(board, domain)
+    options = ['-I', '$(cat /var/lib/artiq/boards/{})'.format(board), *options]
+
     factory.addStep(
         ShellCommand(
             name              = 'artiq_flash',
@@ -419,9 +422,9 @@ def addARTIQFlashSteps(factory, options, address):
     factory.addStep(
         MasterShellCommand(
             name              = 'ping',
-            command           = ['ping', address, '-c10', '-w30'],
-            description       = ['pinging', address],
-            descriptionDone   = ['ping', address],
+            command           = ['ping', domain, '-c10', '-w30'],
+            description       = ['pinging', domain],
+            descriptionDone   = ['ping', domain],
             haltOnFailure     = True,
             locks             = default_locks))
 
@@ -545,8 +548,8 @@ c['builders'].append(
 
 ####### ARTIQ
 
+test_board          = 'kc705-1'
 test_board_package  = 'artiq-kc705-nist_clock'
-test_board_hostname = 'kc705-1.lab.m-labs.hk'
 
 #------ artiq
 
@@ -583,10 +586,10 @@ addTriggerSteps(artiqBuildFactory,
 addCondaInstallSteps(artiqBuildFactory,
     packages=[test_board_package + "=%(output_version)s"])
 addFlockAcquireSteps(artiqBuildFactory,
-    board='kc705-1')
+    board=test_board)
 addARTIQFlashSteps(artiqBuildFactory,
-    options=[],
-    address=test_board_hostname)
+    board=test_board,
+    domain='lab.m-labs.hk')
 addPythonCoverageSteps(artiqBuildFactory,
     source_path='artiq', test_path='artiq/test/coredevice',
     locks=[low_latency_lock.access('exclusive')],
@@ -601,7 +604,7 @@ addTriggerSteps(artiqBuildFactory,
     waitForFinish=True,
     set_properties={'package': WithProperties('%(output_name)s')})
 addFlockReleaseSteps(artiqBuildFactory,
-    board='kc705-1')
+    board=test_board)
 # Build and upload ARTIQ documentation
 addSphinxDocumentSteps(artiqBuildFactory,
     source_path='doc/manual',