infra/buildbot: fix "for w workers", use common defs for common sets
diff --git a/infra/buildbot/master/master.cfg b/infra/buildbot/master/master.cfg
index 3bb2711..90316a9 100644
--- a/infra/buildbot/master/master.cfg
+++ b/infra/buildbot/master/master.cfg
@@ -80,16 +80,20 @@
w["session"] = 'qemu+ssh://buildbot@sagan.jakma.org/system'
osbuilders = ["build-" + kw for kw in workers]
+osfastbuilders = ["build-" + kw for kw in workers if workers[kw]["vm"] == False]
+osslowbuilders = ["build-" + kw for kw in workers if workers[kw]["vm"] == True]
+
+rpmbuilders = ["rpm-" + kw for kw in workers if workers[kw]["pkg"] == "rpm"]
allbuilders = []
allbuilders += osbuilders
-allbuilders += ["rpm-" + kw for kw in workers if workers[kw]["pkg"] == "rpm"]
+allbuilders += rpmbuilders
allbuilders += analyses_builders
allbuilders += ["commit-builder"]
allbuilders += ["build-distcheck"]
# Force merging of requests.
-c['mergeRequests'] = lambda *args, **kwargs: True
+# c['mergeRequests'] = lambda *args, **kwargs: True
####### BUILDSLAVES
c['slaves'] = []
@@ -159,16 +163,12 @@
# Initial build checks on faster, non-VM
c['schedulers'].append(schedulers.Triggerable(
name="trigger-build-first",
- builderNames=list("build-" + kw
- for kw in workers
- if workers[kw]["vm"] == False)))
+ builderNames=osfastbuilders))
# Build using remaining builders, after firstbuilders.
c['schedulers'].append(schedulers.Triggerable(
name="trigger-build-rest",
- builderNames=list("build-" + kw
- for w in workers
- if workers[kw]["vm"] == True)))
+ builderNames=osslowbuilders))
# Analyses tools, e.g. CLang Analyzer scan-build
c['schedulers'].append(schedulers.Triggerable(
@@ -181,9 +181,7 @@
# RPM check and build
c['schedulers'].append(schedulers.Triggerable(
name="trigger-rpm",
- builderNames=["rpm-" + kw
- for kw in workers
- if workers[kw]["pkg"] == "rpm"]))
+ builderNames=rpmbuilders))
# Try and force schedulers
c['schedulers'].append(schedulers.ForceScheduler(
@@ -192,10 +190,9 @@
c['schedulers'].append(schedulers.Try_Userpass(
name="try",
- builderNames=["build-" + kw for kw in workers]
- + ["rpm-" + kw for kw in workers
- if workers[kw]["pkg"] == "rpm"]
- + ["build-distcheck",
+ builderNames=osbuilders
+ + rpmbuilders
+ + ["build-distcheck",
"clang-analyzer" ],
userpass=users,
port=8031))