config/builders/schedulers: Split nightly into quick and full targets

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

builders.py

@@ -188,7 +188,7 @@ def create_builder_factory():
 
 # regular builders
 f = create_builder_factory()
-for builder in config.triggered_builders:
+for builder in config.subbuilders:
     workers = config.builder_to_workers.get(builder, None)
     if not workers:
         workers = config.builder_to_workers['default']
@@ -196,6 +196,7 @@ for builder in config.triggered_builders:
                                        workernames=workers,
                                        factory=f, env=extra_env))
 
+def create_parent_builder_factory(waitname):
     factory = util.BuildFactory()
     # NOTE: Assumes that yocto-autobuilder repo has been cloned to home
     # directory of the user running buildbot.
@@ -289,7 +290,7 @@ def get_props_set():
 
         return set_props
 
-factory.addStep(steps.Trigger(schedulerNames=['wait'],
+    factory.addStep(steps.Trigger(schedulerNames=[waitname],
                                   waitForFinish=True,
                                   set_properties=get_props_set()))
 
@@ -304,7 +305,5 @@ factory.addStep(steps.ShellCommand(
             ],
         name="Send QA Email"))
 
-builders.append(
-    util.BuilderConfig(name="nightly",
-                       workernames=config.workers,
-                       factory=factory, env=extra_env))
+builders.append(util.BuilderConfig(name="quick", workernames=config.workers, factory=create_parent_builder_factory("wait-quick"), env=extra_env))
+builders.append(util.BuilderConfig(name="full", workernames=config.workers, factory=create_parent_builder_factory("wait-full"), env=extra_env))

config.py

@@ -3,7 +3,10 @@
 buildertorepos = {
     "eclipse-plugin-neon": ["eclipse-poky-neon"],
     "eclipse-plugin-oxygen": ["eclipse-poky-oxygen"],
-    "nightly": ["poky", "meta-intel", "oecore", "bitbake",
+    "quick": ["poky", "meta-intel", "oecore", "bitbake",
+                "eclipse-poky-neon", "eclipse-poky-oxygen", "meta-qt4",
+                "meta-qt3", "meta-mingw", "meta-gplv2"],
+    "full": ["poky", "meta-intel", "oecore", "bitbake",
                 "eclipse-poky-neon", "eclipse-poky-oxygen", "meta-qt4",
                 "meta-qt3", "meta-mingw", "meta-gplv2"],
     "non-gpl3": ["poky", "meta-gplv2"],
@@ -35,16 +38,16 @@ repos = {
     "meta-gplv2": ["git://git.yoctoproject.org/meta-gplv2", "master"]
 }
 
-trigger_builders_wait = [
+trigger_builders_wait_quick = [
     "qemuarm", "qemuarm-lsb", "qemuarm64", "qemuarm-oecore",
-    "qemumips", "qemumips-lsb", "qemumips64",
+    "qemumips", "qemumips64",
     "multilib",
-    "qemuppc", "qemuppc-lsb",
+    "qemuppc",
     "qemux86", "qemux86-lsb",
     "qemux86-64", "qemux86-64-lsb",
-    "qemux86-64-x32", "qemux86-world", "qemux86-world-lsb",
-    "edgerouter", "edgerouter-lsb",
-    "mpc8315e-rdb", "mpc8315e-rdb-lsb",
+    "qemux86-64-x32", "qemux86-world",
+    "edgerouter",
+    "mpc8315e-rdb",
     "genericx86", "genericx86-lsb",
     "genericx86-64", "genericx86-64-lsb",
     "beaglebone", "beaglebone-lsb",
@@ -57,8 +60,12 @@ trigger_builders_wait = [
     "check-layer"
 ]
 
-triggered_builders = trigger_builders_wait
-builders = ["nightly"] + triggered_builders
+trigger_builders_wait_full = [
+    "qemumips-lsb", "edgerouter-lsb", "mpc8315e-rdb-lsb", "qemuppc-lsb", "qemux86-world-lsb"
+]
+
+subbuilders = trigger_builders_wait_quick + trigger_builders_wait_full
+builders = ["quick", "full"]
 
 # ## Cluster configuration
 # Publishing settings

schedulers.py

@@ -68,7 +68,7 @@ def props_for_builder(builder):
     return props
 
 
-for builder in config.triggered_builders:
+for builder in config.subbuilders:
     schedulers.append(sched.ForceScheduler(
         name=builder,
         builderNames=[builder],
@@ -81,14 +81,18 @@ for builder in config.triggered_builders:
         buttonName="Force Build"))
 
 # nightly builder triggers various other builders
-wait = sched.Triggerable(name="wait",
-                         builderNames=config.trigger_builders_wait)
-schedulers.append(wait)
+wait_quick = sched.Triggerable(name="wait-quick",
+                         builderNames=config.trigger_builders_wait_quick)
+schedulers.append(wait_quick)
+wait_full = sched.Triggerable(name="wait-full",
+                         builderNames=config.trigger_builders_wait_quick + config.trigger_builders_wait_full)
+schedulers.append(wait_full)
 
-schedulers.append(sched.ForceScheduler(
-    name="nightly",
-    builderNames=["nightly"],
-    buttonName="Start Nightly Build",
+def parent_scheduler(target):
+    return sched.ForceScheduler(
+    name=target,
+    builderNames=[target],
+    buttonName="Start " + target + " Build",
     codebases = [util.CodebaseParameter(codebase='', label="yocto-autobuilder-helper:", project=None)],
     reason=util.StringParameter(
         name="reason",
@@ -236,4 +240,8 @@ schedulers.append(sched.ForceScheduler(
             name="deploy_artefacts",
             label="Do we want to save build output? ",
             default=False)
-    ]+repos_for_builder("nightly")))
+    ]+repos_for_builder(target))
+
+schedulers.append(parent_scheduler("quick"))
+schedulers.append(parent_scheduler("full"))
+