Use a single artiq-board conda package for building boards.

m-labs · Feb 22, 2018 · 66b2a91 · 66b2a91
1 parent 786314e
commit 66b2a91
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/master.cfg b/master.cfg
@@ -138,7 +138,8 @@ def addUpdateSteps(factory, project):
             mode              = 'incremental',
             progress          = True))
 
-def addCondaBuildSteps(factory, project, package, is_xilinx=False, test=True, channel=None):
+def addCondaBuildSteps(factory, project, package, is_xilinx=False, test=True, channel=None,
+                       environment={}):
     addUpdateSteps(factory, project)
 
     build_cmd = ['conda', 'build', '--python', '3.5']
@@ -170,7 +171,7 @@ def addCondaBuildSteps(factory, project, package, is_xilinx=False, test=True, ch
             description       = 'querying',
             descriptionSuffix = 'output name',
             haltOnFailure     = True,
-            env               = condaEnv(),
+            env               = merge(condaEnv(), environment),
             locks             = default_locks +
                                 [conda_lock.access('exclusive')]))
 
@@ -183,7 +184,7 @@ def addCondaBuildSteps(factory, project, package, is_xilinx=False, test=True, ch
             descriptionDone   = ['build', WithProperties(package)],
             haltOnFailure     = True,
             timeout           = 60*60*4,
-            env               = condaEnv(),
+            env               = merge(condaEnv(), environment),
             locks             = default_locks +
                                 [conda_lock.access('exclusive')]))
 
@@ -496,8 +497,9 @@ c['builders'].append(
 
 ####### ARTIQ
 
-test_board          = 'kc705-1'
-test_board_package  = 'artiq-kc705-nist_clock'
+test_board   = 'kc705-1'
+test_target  = 'kc705'
+test_variant = 'nist_clock'
 
 #------ artiq
 
@@ -528,8 +530,10 @@ addTriggerSteps(artiqBuildFactory,
     builder_names=["artiq-board"],
     alwaysUseLatest=False,
     waitForFinish=True,
-    set_properties={"package": test_board_package,
-                    "force_upload": True})
+    set_properties={"package": "artiq-board",
+                    "force_upload": True,
+                    "artiq_target": test_target,
+                    "artiq_variant": test_variant})
 # Test ARTIQ with hardware in the loop
 addCondaInstallSteps(artiqBuildFactory,
     packages=[test_board_package + "=%(output_version)s"])
@@ -594,7 +598,9 @@ for var in ["board1", "board2"]:
         alwaysUseLatest=False,
         waitForFinish=True,
         set_properties={"package": WithProperties('artiq-%(' + var + ')s'),
-                        "channel": WithProperties('%(channel:-quick)s')},
+                        "channel": WithProperties('%(channel:-quick)s'),
+                        "artiq_target": WithProperties("%(artiq_target)s"),
+                        "artiq_variant": WithProperties("%(artiq_variant)s")},
         doStepIf=lambda step: step.getProperty(var),
         hideStepIf=lambda step, result: result == SKIPPED)
 
@@ -612,7 +618,13 @@ c['builders'].append(
 
 artiqBoardBuildFactory = BuildFactory()
 addCondaBuildSteps(artiqBoardBuildFactory,
-    project='artiq', package='%(package)s', is_xilinx=True, channel='%(channel:-dev)s')
+    project='artiq',  package='%(package)s',
+    channel='%(channel:-dev)s',
+    is_xilinx=True,
+    environment={
+        "ARTIQ_TARGET": WithProperties("%(artiq_target)s"),
+        "ARTIQ_VARIANT": WithProperties("%(artiq_variant)s"),
+    })
 addCondaUploadSteps(artiqBoardBuildFactory,
     force=True, label='%(channel:-dev)s')