inline factories and steps for clarity

diff --git a/master.cfg b/master.cfg
index 3d44d15bb0c5dc84b8d0c76fd91afb5c55381007..9da8f18a73e0a2e5d47c1c3c8b2337205835d9f2 100644 (file)
--- a/master.cfg
+++ b/master.cfg
@@ -127,13 +127,13 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="npupnp"),
     treeStableTimer=None,
     builderNames=["npupnp"]))
-factory = BuildFactory()
-factory.addStep(ShellCommand(command=["echo", "hello"]))
 c['builders'].append(BuilderConfig(
     name="npupnp",
     tags=["mpd"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        ShellCommand(command=["echo", "hello"])
+    ])))
 
 ####### libupnpp tag notifications
 
@@ -148,13 +148,13 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="libupnpp"),
     treeStableTimer=None,
     builderNames=["libupnpp"]))
-factory = BuildFactory()
-factory.addStep(ShellCommand(command=["echo", "hello"]))
 c['builders'].append(BuilderConfig(
     name="libupnpp",
     tags=["mpd"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        ShellCommand(command=["echo", "hello"])
+    ])))
 
 ####### upmpdcli tag notifications
 
@@ -169,18 +169,19 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="upmpdcli"),
     treeStableTimer=None,
     builderNames=["upmpdcli"]))
-factory = BuildFactory()
-factory.addStep(ShellCommand(command=["echo", "hello"]))
 c['builders'].append(BuilderConfig(
     name="upmpdcli",
     tags=["mpd"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        ShellCommand(command=["echo", "hello"])
+    ])))
 
 ####### veilid tag builds
 
+repourl='https://gitlab.com/veilid/veilid.git'
 c['change_source'].append(GitPoller(
-    'https://gitlab.com/veilid/veilid.git',
+    repourl,
     project='veilid',
     workdir='veilid',
     only_tags=True,
@@ -191,27 +192,27 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="veilid"),
     treeStableTimer=None,
     builderNames=["veilid"]))
-factory = BuildFactory()
-factory.addStep(Git(repourl='https://gitlab.com/veilid/veilid.git'))
-factory.addStep(ShellCommand(
-    name="build veilid-server",
-    command=["cargo","build","--release"],
-    workdir="build/veilid-server"))
-factory.addStep(ShellCommand(
-    name="copy veilid-server to lin0",
-    command=["scp","target/release/veilid-server","lin0:~"]))
-factory.addStep(ShellCommand(
-    name="build veilid-cli",
-    command=["cargo","build","--release"],
-    workdir="build/veilid-cli"))
-factory.addStep(ShellCommand(
-    name="copy veilid-cli to lin0",
-    command=["scp","target/release/veilid-cli","lin0:~"]))
 c['builders'].append(BuilderConfig(
     name="veilid",
     tags=["veilid"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        Git(repourl=repourl),
+        ShellCommand(
+            name="build veilid-server",
+            command=["cargo","build","--release"],
+            workdir="build/veilid-server"),
+        ShellCommand(
+            name="copy veilid-server to lin0",
+            command=["scp","target/release/veilid-server","lin0:~"]),
+        ShellCommand(
+            name="build veilid-cli",
+            command=["cargo","build","--release"],
+            workdir="build/veilid-cli"),
+        ShellCommand(
+            name="copy veilid-cli to lin0",
+            command=["scp","target/release/veilid-cli","lin0:~"]),
+    ])))
 
 ####### crawl tag notifications
 
@@ -227,13 +228,13 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="crawl"),
     treeStableTimer=None,
     builderNames=["crawl"]))
-factory = BuildFactory()
-factory.addStep(ShellCommand(command=["echo", "hello"]))
 c['builders'].append(BuilderConfig(
     name="crawl",
     tags=["crawl"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        ShellCommand(command=["echo", "hello"])
+    ])))
 
 ####### ledger tag notifications
 
@@ -249,13 +250,13 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="ledger"),
     treeStableTimer=None,
     builderNames=["ledger"]))
-factory = BuildFactory()
-factory.addStep(ShellCommand(command=["echo", "hello"]))
 c['builders'].append(BuilderConfig(
     name="ledger",
     tags=["ledger"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        ShellCommand(command=["echo", "hello"])
+    ])))
 
 ####### toy project with triggers
 
@@ -324,46 +325,46 @@ c['schedulers'].append(Triggerable(
 c['schedulers'].append(Triggerable(
     name="build-backend-job",
     builderNames=["build-backend-job"]))
-factory = BuildFactory()
-factory.addStep(Trigger(
-    schedulerNames=["fetch-deps-stage"],
-    waitForFinish=True,
-    name="fetch-deps"))
-factory.addStep(Trigger(
-    schedulerNames=["build-frontend-job","build-backend-job"],
-    waitForFinish=True,
-    name="build frontend and backend"))
-factory.addStep(ShellCommand(command=["echo", "hello", Secret("test.delete")],name="echo something"))
 c['builders'].append(BuilderConfig(
     name="stage-test",
     tags=["stage-test","entry"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        Trigger(
+            schedulerNames=["fetch-deps-stage"],
+            waitForFinish=True,
+            name="fetch-deps"),
+        Trigger(
+            schedulerNames=["build-frontend-job","build-backend-job"],
+            waitForFinish=True,
+            name="build frontend and backend"),
+        ShellCommand(command=["echo", "hello", Secret("test.delete")],name="echo something")
+    ])))
 
-factory = BuildFactory()
-factory.addStep(ShellCommand(command=["echo", "hello"],name="echo"))
 c['builders'].append(BuilderConfig(
     name="fetch-deps-stage",
     tags=["stage-test"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        ShellCommand(command=["echo", "hello"],name="echo")
+    ])))
 
-factory = BuildFactory()
-factory.addStep(HLedgerVersion(name="hledger version"))
-factory.addStep(ShellCommand(command=["sleep", "12"],name="sleep"))
-factory.addStep(ShellCommand(command=["exit", "1"],name="fail"))
 c['builders'].append(BuilderConfig(
     name="build-frontend-job",
     tags=["stage-test"],
     workernames=["carbon-worker"],
-    factory=factory))
-factory = BuildFactory()
-factory.addStep(ShellCommand(command=["sleep", "20"],name="sleep"))
+    factory=BuildFactory([
+        HLedgerVersion(name="hledger version"),
+        ShellCommand(command=["sleep", "12"],name="sleep"),
+        ShellCommand(command=["exit", "1"],name="fail")
+    ])))
 c['builders'].append(BuilderConfig(
     name="build-backend-job",
     tags=["stage-test"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        ShellCommand(command=["sleep", "20"],name="sleep")
+    ])))
 
 ####### fcgisrv
 
@@ -378,21 +379,21 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="fcgisrv"),
     treeStableTimer=None,
     builderNames=["fcgisrv"]))
-factory = BuildFactory()
-factory.addStep(Git(repourl='lin0:'+localrepo,branch='master'))
-factory.addStep(ShellCommand(
-    name="build fcgisrv",
-    command=["cargo","build","--release"],
-    haltOnFailure=True,
-    workdir="build"))
-factory.addStep(ShellCommand(
-    name="copy fcgisrv to lin0",
-    command=["scp","target/release/fcgisrv","lin0:~"]))
 c['builders'].append(BuilderConfig(
     name="fcgisrv",
     tags=["fcgisrv"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        Git(repourl='lin0:'+localrepo,branch='master'),
+        ShellCommand(
+            name="build fcgisrv",
+            command=["cargo","build","--release"],
+            haltOnFailure=True,
+            workdir="build"),
+        ShellCommand(
+            name="copy fcgisrv to lin0",
+            command=["scp","target/release/fcgisrv","lin0:~"])
+    ])))
 
 ####### hook-test
 
@@ -402,14 +403,14 @@ c['schedulers'].append(SingleBranchScheduler(
     change_filter=ChangeFilter(project="hook-test"),
     treeStableTimer=None,
     builderNames=["hook-test"]))
-factory = BuildFactory()
-factory.addStep(Git(repourl='lin0:'+localrepo,branch='main'))
-factory.addStep(ShellCommand(
-    name="echo something",
-    command=["echo","hello"],
-    haltOnFailure=True))
 c['builders'].append(BuilderConfig(
     name="hook-test",
     tags=["hook-test"],
     workernames=["carbon-worker"],
-    factory=factory))
+    factory=BuildFactory([
+        Git(repourl='lin0:'+localrepo,branch='main'),
+        ShellCommand(
+            name="echo something",
+            command=["echo","hello"],
+            haltOnFailure=True)
+    ])))