taler-deployment

commit 6766d8e82179903b9769766b18b30a20c44539dc
parent 087ab92aa0ec67ac4722a25bab86080e74cc6198
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Wed, 17 Apr 2019 00:05:22 +0200

Use dependent scheduler.

Diffstat:
M
buildbot/master.cfg
 | 
26
++++++++++++++++----------

1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -119,6 +119,11 @@ ALL_SCHEDULER = schedulers.SingleBranchScheduler(
     treeStableTimer=None,
     builderNames=["builder-builder"])
 
+TESTSWITCHER_SCHEDULER = schedulers.Dependent(
+    name="testswitcher-scheduler",
+    upstream=ALL_SCHEDULER,
+    builderNames=["testswitcher-builder"])
+
 # Scheduler monitoring the help.git repo; a forgotten repo we
 # use to test BB.
 DEBUG_SCHEDULER = schedulers.SingleBranchScheduler(
@@ -147,7 +152,7 @@ FORCE_SCHEDULER = schedulers.ForceScheduler(
         "lcov-builder",
         "auditor-builder",
         "selenium-builder",
-        "switcher-builder",
+        "testswitcher-builder",
         "builder-builder",
         "doc-builder",
         "wallet-builder",
@@ -160,6 +165,7 @@ c["schedulers"] = [
     DOC_SCHEDULER,
     WALLET_SCHEDULER,
     ALL_SCHEDULER,
+    TESTSWITCHER_SCHEDULER,
     FORCE_SCHEDULER,
     DEBUG_SCHEDULER,
     LINT_SCHEDULER]
@@ -324,10 +330,10 @@ BUILD_FACTORY.addStep(ShellCommand(
     env={'DEPLOYMENT': "test"}))
 
 
-SWITCH_FACTORY = util.BuildFactory()
-SWITCH_FACTORY.addStep(git_step(
+TESTSWITCH_FACTORY = util.BuildFactory()
+TESTSWITCH_FACTORY.addStep(git_step(
     "git://git.taler.net/deployment.git"))
-SWITCH_FACTORY.addStep(ShellCommand(
+TESTSWITCH_FACTORY.addStep(ShellCommand(
     name="switch active party",
     description="Switch to the party which was inactive.",
     descriptionDone="Active party has been switched.",
@@ -431,10 +437,10 @@ BUILDER_BUILDER = util.BuilderConfig(
     nextWorker=pick_inactive_color,
     factory=BUILD_FACTORY)
 
-SWITCHER_BUILDER = util.BuilderConfig(
-    name="switcher-builder",
+TESTSWITCHER_BUILDER = util.BuilderConfig(
+    name="testswitcher-builder",
     workernames=["testswitcher-worker"],
-    factory=SWITCH_FACTORY)
+    factory=TESTSWITCH_FACTORY)
 
 SELENIUM_BUILDER = util.BuilderConfig(
     name="selenium-builder",
@@ -455,7 +461,7 @@ c["builders"] = [
     LCOV_BUILDER,
     AUDITOR_BUILDER,
     BUILDER_BUILDER,
-    SWITCHER_BUILDER,
+    TESTSWITCHER_BUILDER,
     TIP_RESERVE_TOPPER_BUILDER,
     DEMO_SERVICES_CHECKER_BUILDER,
     SELENIUM_BUILDER,
@@ -488,7 +494,7 @@ EMAIL = reporters.MailNotifier(
     # notify from pass to fail, and viceversa.
     mode=("change"),
     builders=(
-        "switcher-builder",
+        "testswitcher-builder",
         "doc-builder",
         "wallet-builder",
         "selenium-builder"),
@@ -507,7 +513,7 @@ c["buildbotURL"] = "https://buildbot.wild.gv.taler.net/"
 
 from taler_bb_userpass_db import USER_PASSWORD_DB
 
-BUILDER_LIST = ["switcher-builder",
+BUILDER_LIST = ["testswitcher-builder",
                 "doc-builder",
                 "lcov-builder",
                 "wallet-builder",