taler-deployment

commit fec7f7101d89ee7c998cb113565574100d512181
parent 2b83b8dcc42bc2e06e8f8312b0988421e9376c7d
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Wed,  5 Jun 2019 17:41:49 +0200

demo-auditor BB instrumentation.

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

1 file changed, 43 insertions(+), 7 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -100,6 +100,18 @@ c["workers"] = [
     worker.Worker("auditor-worker-blue", "auditor-blue-pass")]
 
 
+    ##
+    # This worker compiles the auditor reports for the "green"
+    # demo deployment.
+    worker.Worker("demo-auditor-worker-green",
+                  "demo-auditor-green-pass"),
+
+    ##
+    # This worker compiles the auditor reports for the "blue"
+    # demo deployment.
+    worker.Worker("demo-auditor-worker-blue",
+                  "demo-auditor-blue-pass")]
+
 ##
 # Maps usernames to workers.
 #
@@ -109,8 +121,12 @@ def pick_map(buildername):
                           "test-blue": "builder-worker-blue"}
     topper_worker_map = {"test-green": "topper-worker-green",
                          "test-blue": "topper-worker-blue"}
-    auditor_worker_map = {"test-green": "auditor-worker-green",
-                          "test-blue": "auditor-worker-blue"}
+    auditor_worker_map = {
+        "test-green": "auditor-worker-green",
+        "test-blue": "auditor-worker-blue",
+        "demo-green": "demo-auditor-worker-green",
+        "demo-blue": "demo-auditor-worker-blue"}
+
     meta_map = {"builder-builder": builder_worker_map,
                 "auditor-builder": auditor_worker_map,
                 "tip-reserve-topper-builder": topper_worker_map}
@@ -161,6 +177,7 @@ def doc_filter(change):
 NIGHTLY_SCHEDULER = schedulers.Nightly(
     name="nightly-scheduler",
     builderNames=["lcov-builder",
+                  "auditor-builder-demo",
                   "auditor-builder"],
     branch="master",
     hour=6,
@@ -247,6 +264,7 @@ FORCE_SCHEDULER = schedulers.ForceScheduler(
         "debug-builder",
         "lcov-builder",
         "auditor-builder",
+        "auditor-builder-demo",
         "selenium-builder",
         "testswitcher-builder",
         "builder-builder",
@@ -357,7 +375,6 @@ AUDITOR_FACTORY.addStep(ShellCommand(
     description="Generating auditor reports.",
     descriptionDone="Auditor reports correctly generated.",
     command=["./make_auditor_reports.sh"],
-    env={"TALER_DEPLOYMENT": "test"},
     workdir="build/buildbot"))
 
 
@@ -500,11 +517,12 @@ LCOV_BUILDER = util.BuilderConfig(
 # Helper function that picks the active deployment between
 # blue and green and schedules it as the next worker for producing
 # auditor reports.
-def pick_active_color(builder, workers_list, build_request):
+def pick_active_color(
+        marker, builder, workers_list, build_request):
 
-    f = open("/home/test/active", "r")
+    f = open(marker, "r")
     if not f:
-        print("'test' doesn't specify the active color, abort")
+        print("No active color in marker (%s)" % marker)
         f.close()
         return None
     active = f.readline().rstrip()
@@ -520,14 +538,30 @@ def pick_active_color(builder, workers_list, build_request):
     f.close()
     return None
 
+def pick_active_color_test (builder, workers_list, build_request):
+    return pick_active_color (
+        "/home/test/active", workers_list, build_request)
+
+def pick_active_color_demo (builder, workers_list, build_request):
+    return pick_active_color (
+        "/home/demo/active", workers_list, build_request)
 
 AUDITOR_BUILDER = util.BuilderConfig(
     name="auditor-builder",
-    nextWorker=pick_active_color,
+    nextWorker=pick_active_color_test,
     workernames=["auditor-worker-blue",
                  "auditor-worker-green"],
     factory=AUDITOR_FACTORY)
 
+AUDITOR_BUILDER_DEMO = util.BuilderConfig(
+    name="auditor-builder",
+    nextWorker=pick_active_color_demo,
+    workernames=["demo-auditor-worker-blue",
+                 "demo-auditor-worker-green"],
+    factory=AUDITOR_FACTORY)
+
+
+
 TIP_RESERVE_TOPPER_BUILDER = util.BuilderConfig(
     name="tip-reserve-topper-builder",
     workernames=["topper-worker-green",
@@ -600,6 +634,7 @@ WALLET_BUILDER = util.BuilderConfig(
 c["builders"] = [
     LCOV_BUILDER,
     AUDITOR_BUILDER,
+    AUDITOR_BUILDER_DEMO,
     BUILDER_BUILDER,
     TESTSWITCHER_BUILDER,
     TIP_RESERVE_TOPPER_BUILDER,
@@ -660,6 +695,7 @@ BUILDER_LIST = ["testswitcher-builder",
                 "lcov-builder",
                 "wallet-builder",
                 "auditor-builder",
+                "auditor-builder-demo",
                 "demo-services-checker-builder",
                 "tip-reserve-topper-builder",
                 "lint-builder",