Skip to content

Commit 246ab55

Browse files
committed
Allow multiple workers per builder
It's a hack, for now.
1 parent 72651a5 commit 246ab55

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

master/master.cfg

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,14 @@ mail_status_builders = []
233233
for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
234234
buildernames = []
235235
refleakbuildernames = []
236-
for name, worker_name, buildfactory, stability, tier in BUILDERS:
236+
for name, worker_names, buildfactory, stability, tier in BUILDERS:
237+
# XXX: Hack; need to actually support this, which will take a more
238+
# significant rewrite of...everything.
239+
worker_name = worker_names
240+
if isinstance(worker_names, tuple):
241+
worker_name = worker_names[0]
242+
else:
243+
worker_names = (worker_names,)
237244
if any(
238245
pattern in name for pattern in ONLY_MAIN_BRANCH
239246
) and branchname != MAIN_BRANCH_NAME:
@@ -296,7 +303,7 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
296303

297304
builder = util.BuilderConfig(
298305
name=buildername,
299-
workernames=[worker_name],
306+
workernames=list(worker_names),
300307
builddir="%s.%s%s"
301308
% (branchname, worker_name, getattr(f, "buildersuffix", "")),
302309
factory=f,
@@ -341,7 +348,14 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
341348
stable_pull_request_builders = []
342349
all_pull_request_builders = []
343350

344-
for name, worker_name, buildfactory, stability, tier in BUILDERS:
351+
for name, worker_names, buildfactory, stability, tier in BUILDERS:
352+
# XXX: Hack; need to actually support this, which will take a more
353+
# significant rewrite of...everything.
354+
worker_name = worker_names
355+
if isinstance(worker_names, tuple):
356+
worker_name = worker_names[0]
357+
else:
358+
worker_names = (worker_names,)
345359
buildername = f"{name} PR"
346360
all_pull_request_builders.append(buildername)
347361
if stability == STABLE:
@@ -365,7 +379,7 @@ for name, worker_name, buildfactory, stability, tier in BUILDERS:
365379

366380
builder = util.BuilderConfig(
367381
name=buildername,
368-
workernames=[worker_name],
382+
workernames=list(worker_names),
369383
builddir="%s.%s%s"
370384
% ("pull_request", worker_name, getattr(f, "buildersuffix", "")),
371385
factory=f,

0 commit comments

Comments
 (0)