Wait for all triggers to complete before publishing

This means that when we stop builds, all triggered builds also stop.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-03-12 16:19:44 -07:00
parent 04a134f2e7
commit 063c5798fd
3 changed files with 2 additions and 10 deletions

View File

@ -237,9 +237,6 @@ def get_props_set():
return set_props return set_props
factory.addStep(steps.Trigger(schedulerNames=['nowait'],
waitForFinish=False,
set_properties=get_props_set()))
factory.addStep(steps.Trigger(schedulerNames=['wait'], factory.addStep(steps.Trigger(schedulerNames=['wait'],
waitForFinish=True, waitForFinish=True,
set_properties=get_props_set())) set_properties=get_props_set()))

View File

@ -42,9 +42,7 @@ trigger_builders_wait = [
"nightly-x86-64", "nightly-x86-64-lsb", "nightly-x86-64", "nightly-x86-64-lsb",
"nightly-x86", "nightly-x86-lsb", "nightly-x86", "nightly-x86-lsb",
"nightly-packagemanagers", "nightly-packagemanagers",
"nightly-rpm-non-rpm", "nightly-deb-non-deb" "nightly-rpm-non-rpm", "nightly-deb-non-deb",
]
trigger_builders_nowait = [
"build-appliance", "buildtools", "eclipse-plugin-neon", "build-appliance", "buildtools", "eclipse-plugin-neon",
"eclipse-plugin-oxygen", "nightly-non-gpl3", "nightly-oecore", "eclipse-plugin-oxygen", "nightly-non-gpl3", "nightly-oecore",
"nightly-world", "nightly-wic", "nightly-world-lsb", "nightly-world", "nightly-wic", "nightly-world-lsb",
@ -52,7 +50,7 @@ trigger_builders_nowait = [
"nightly-qa-extras", "nightly-oe-selftest" "nightly-qa-extras", "nightly-oe-selftest"
] ]
triggered_builders = trigger_builders_wait + trigger_builders_nowait triggered_builders = trigger_builders_wait
builders = ["nightly"] + triggered_builders builders = ["nightly"] + triggered_builders
# Supported Yocto Project releases, by name # Supported Yocto Project releases, by name

View File

@ -85,9 +85,6 @@ for builder in config.triggered_builders:
wait = sched.Triggerable(name="wait", wait = sched.Triggerable(name="wait",
builderNames=config.trigger_builders_wait) builderNames=config.trigger_builders_wait)
schedulers.append(wait) schedulers.append(wait)
nowait = sched.Triggerable(name="nowait",
builderNames=config.trigger_builders_nowait)
schedulers.append(nowait)
schedulers.append(sched.ForceScheduler( schedulers.append(sched.ForceScheduler(
name="nightly", name="nightly",