parallel steps

diff --git a/master.cfg b/master.cfg
index f4578db30a398c5a024087b120ddb1ae9cce0f88..3dd2bf9bab9ea495beecb13e407fc5e81d72e4be 100644 (file)
--- a/master.cfg
+++ b/master.cfg
@@ -163,9 +163,6 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
 c['schedulers'].append(schedulers.Triggerable(
                             name="fetch-deps-stage",
                             builderNames=["fetch-deps-stage"]))
-c['schedulers'].append(schedulers.Triggerable(
-                            name="build-stage",
-                            builderNames=["build-stage"]))
 c['schedulers'].append(schedulers.Triggerable(
                             name="build-frontend-job",
                             builderNames=["build-frontend-job"]))
@@ -250,16 +247,18 @@ c['builders'].append(
 
 factory = util.BuildFactory()
 factory.addStep(steps.Trigger(schedulerNames=["fetch-deps-stage"],
-                              waitForFinish=False,
+                              waitForFinish=True,
                               name="fetch-deps"))
-factory.addStep(steps.Trigger(schedulerNames=["build-stage"],
-                              waitForFinish=False,
-                              name="build"))
+factory.addStep(steps.Trigger(schedulerNames=["build-frontend-job","build-backend-job"],
+                              waitForFinish=True,
+                              name="build frontend and backend"))
+factory.addStep(steps.ShellCommand(command=["echo", "hello"],name="echo something"))
 c['builders'].append(
     util.BuilderConfig(name="stage-test",
                        tags=["stage-test","entry"],
                        workernames=["carbon-worker"],
                        factory=factory))
+
 factory = util.BuildFactory()
 factory.addStep(steps.ShellCommand(command=["echo", "hello"],name="echo"))
 c['builders'].append(
@@ -267,18 +266,7 @@ c['builders'].append(
                        tags=["stage-test"],
                        workernames=["carbon-worker"],
                        factory=factory))
-factory = util.BuildFactory()
-factory.addStep(steps.Trigger(schedulerNames=["build-frontend-job"],
-                              waitForFinish=False,
-                              name="build frontend"))
-factory.addStep(steps.Trigger(schedulerNames=["build-backend-job"],
-                              waitForFinish=False,
-                              name="build backend"))
-c['builders'].append(
-    util.BuilderConfig(name="build-stage",
-                       tags=["stage-test"],
-                       workernames=["carbon-worker"],
-                       factory=factory))
+
 factory = util.BuildFactory()
 factory.addStep(HLedgerVersion(name="hledger version"))
 factory.addStep(steps.ShellCommand(command=["sleep", "12"],name="sleep"))