Allow building two board packages in artiq-quick.

m-labs · Jan 19, 2018 · 20f2d26 · 20f2d26
1 parent f29aeec
commit 20f2d26
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/master.cfg b/master.cfg
@@ -454,17 +454,14 @@ def addFlockReleaseSteps(factory, board):
             locks             = default_locks))
 
 def addTriggerSteps(factory, builder_names, alwaysUseLatest,
-                    waitForFinish=False,
-                    copy_properties=[], set_properties={}):
+                    waitForFinish=False, **kwargs):
     factory.addStep(
         Trigger(
             schedulerNames    = map(lambda name: 'trigger-{}'.format(name),
                                     builder_names),
             alwaysUseLatest   = alwaysUseLatest,
             waitForFinish     = waitForFinish,
-            haltOnFailure     = waitForFinish,
-            copy_properties   = copy_properties,
-            set_properties    = set_properties))
+            haltOnFailure     = waitForFinish))
 
 from buildbot.config import BuilderConfig
 
@@ -641,12 +638,15 @@ addCondaBuildSteps(artiqQuickBuildFactory,
 addCondaUploadSteps(artiqQuickBuildFactory,
     label='%(channel:-quick)s')
 # Build and upload the `artiq-board-*` package
-addTriggerSteps(artiqQuickBuildFactory,
-    builder_names=["artiq-board"],
-    alwaysUseLatest=False,
-    waitForFinish=True,
-    set_properties={"package": WithProperties('artiq-%(board)s'),
-                    "channel": WithProperties('%(channel:-quick)s')})
+for var in ["board1", "board2"]:
+    addTriggerSteps(artiqQuickBuildFactory,
+        builder_names=["artiq-board"],
+        alwaysUseLatest=False,
+        waitForFinish=True,
+        set_properties={"package": WithProperties('artiq-%(' + var + ')s'),
+                        "channel": WithProperties('%(channel:-quick)s')},
+        doStepIf=lambda step: step.getProperty(var),
+        hideStepIf=lambda step, result: result == SKIPPED)
 
 c['builders'].append(
     BuilderConfig(