builders.py: Filter the list of properties we're passing to triggered builds

This reduces unnecessary properties being set in builds where we don't need
them by filtering to the list of repos the build really needs.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-11-22 12:48:46 +00:00
parent 9315359ffb
commit ba73db0480

View File

@ -196,7 +196,7 @@ for builder in config.subbuilders:
workernames=workers, workernames=workers,
factory=f, env=extra_env)) factory=f, env=extra_env))
def create_parent_builder_factory(waitname): def create_parent_builder_factory(buildername, waitname):
factory = util.BuildFactory() factory = util.BuildFactory()
# NOTE: Assumes that yocto-autobuilder repo has been cloned to home # NOTE: Assumes that yocto-autobuilder repo has been cloned to home
# directory of the user running buildbot. # directory of the user running buildbot.
@ -280,7 +280,7 @@ def create_parent_builder_factory(waitname):
"rc_number": util.Property("rc_number") "rc_number": util.Property("rc_number")
} }
for repo in config.repos: for repo in config.buildertorepos[buildername]:
set_props["branch_%s" % repo] = util.Property("branch_%s" % repo) set_props["branch_%s" % repo] = util.Property("branch_%s" % repo)
set_props["commit_%s" % repo] = util.Property("commit_%s" % repo) set_props["commit_%s" % repo] = util.Property("commit_%s" % repo)
set_props["repo_%s" % repo] = util.Property("repo_%s" % repo) set_props["repo_%s" % repo] = util.Property("repo_%s" % repo)
@ -306,5 +306,5 @@ def create_parent_builder_factory(waitname):
name="Send QA Email")) name="Send QA Email"))
return factory return factory
builders.append(util.BuilderConfig(name="a-quick", workernames=config.workers, factory=create_parent_builder_factory("wait-quick"), env=extra_env)) builders.append(util.BuilderConfig(name="a-quick", workernames=config.workers, factory=create_parent_builder_factory("a-quick", "wait-quick"), env=extra_env))
builders.append(util.BuilderConfig(name="a-full", workernames=config.workers, factory=create_parent_builder_factory("wait-full"), env=extra_env)) builders.append(util.BuilderConfig(name="a-full", workernames=config.workers, factory=create_parent_builder_factory("a-full", "wait-full"), env=extra_env))