[GNUnet-SVN] [taler-deployment] branch master updated: slowly maknig BB color-agnostic (for test)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 470c412  slowly maknig BB color-agnostic (for test)
470c412 is described below

commit 470c4121619a51960d8d35c8724110ce5d0e5fda
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jun 27 00:23:46 2019 +0200

    slowly maknig BB color-agnostic (for test)
---
 buildbot/master.cfg | 88 ++++++-----------------------------------------------
 1 file changed, 9 insertions(+), 79 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index ec7147b..655c860 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -44,22 +44,12 @@ c["workers"] = [
     ##
     # This worker builds Taler for the 'green' color under
     # the 'test' deployment.
-    worker.Worker("builder-worker-green", "green-pass"),
-
-    ##
-    # This worker builds Taler for the 'blue' color under
-    # the 'test' deployment.
-    worker.Worker("builder-worker-blue", "blue-pass"),
+    worker.Worker("builder-worker", "builder-pass"),
 
     ##
     # This worker builds Taler for the 'green' color under
     # the 'test' deployment.
-    worker.Worker("topper-worker-green", "topper-green-pass"),
-
-    ##
-    # This worker builds Taler for the 'blue' color under
-    # the 'test' deployment.
-    worker.Worker("topper-worker-blue", "topper-blue-pass"),
+    worker.Worker("topper-worker", "topper-pass"),
 
     ##
     # This worker cares about switching the 'socket' symlink
@@ -77,13 +67,7 @@ c["workers"] = [
     ##
     # This worker compiles the auditor reports for the "green"
     # deployment.
-    worker.Worker("auditor-worker-green", "auditor-green-pass"),
-
-
-    ##
-    # This worker compiles the auditor reports for the "blue"
-    # deployment.
-    worker.Worker("auditor-worker-blue", "auditor-blue-pass"),
+    worker.Worker("test-auditor-worker", "test-auditor-pass"),
 
 
     ##
@@ -116,20 +100,11 @@ c["workers"] = [
 #
 def pick_map(buildername):
 
-    builder_worker_map = {"test-green": "builder-worker-green",
-                          "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",
         "demo-green": "demo-auditor-worker-green",
         "demo-blue": "demo-auditor-worker-blue"}
 
-    meta_map = {"test-builder": builder_worker_map,
-                "auditor-builder": auditor_worker_map,
-                "auditor-builder-demo": auditor_worker_map,
-                "tip-reserve-topper-builder": topper_worker_map}
+    meta_map = {"auditor-builder-demo": auditor_worker_map}
 
     return meta_map.get(buildername)
 # 'protocols' contains information about protocols which master
@@ -247,11 +222,6 @@ ALL_SCHEDULER = schedulers.SingleBranchScheduler(
     treeStableTimer=None,
     builderNames=["test-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(
@@ -299,7 +269,6 @@ c["schedulers"] = [
     DOC_SCHEDULER,
     SITES_SCHEDULER,
     ALL_SCHEDULER,
-    TESTSWITCHER_SCHEDULER,
     FORCE_SCHEDULER,
 
     ##
@@ -541,19 +510,14 @@ def pick_active_color(
     f.close()
     return None
 
-def pick_active_color_test (builder, workers_list, build_request):
-    return pick_active_color (
-        "/home/test/active", builder, workers_list, build_request)
-
 def pick_active_color_demo (builder, workers_list, build_request):
     return pick_active_color (
         "/home/demo/active", builder, workers_list, build_request)
 
-AUDITOR_BUILDER = util.BuilderConfig(
+AUDITOR_BUILDER_TEST = util.BuilderConfig(
     name="auditor-builder",
     nextWorker=pick_active_color_test,
-    workernames=["auditor-worker-blue",
-                 "auditor-worker-green"],
+    workernames=["test-auditor-worker"],
     factory=AUDITOR_FACTORY)
 
 AUDITOR_BUILDER_DEMO = util.BuilderConfig(
@@ -565,8 +529,7 @@ AUDITOR_BUILDER_DEMO = util.BuilderConfig(
 
 TIP_RESERVE_TOPPER_BUILDER = util.BuilderConfig(
     name="tip-reserve-topper-builder",
-    workernames=["topper-worker-green",
-                 "topper-worker-blue"],
+    workernames=["topper-worker"],
     factory=TIP_RESERVE_TOPPER_FACTORY,
     nextWorker=pick_active_color_test)
 
@@ -575,43 +538,11 @@ DEMO_SERVICES_CHECKER_BUILDER = util.BuilderConfig(
     workernames="demo-worker",
     factory=DEMO_SERVICES_CHECKER_FACTORY)
 
-##
-# Helper function that picks the inactive deployment between
-# blue and green and schedules it as the next worker for building
-# Taler.
-def pick_inactive_color(builder, workers_list, build_request):
-
-    f = open("/home/test/nonactive", "r")
-    if not f:
-        print("'test' doesn't specify the nonactive color, abort")
-        f.close()
-        return None
-    nonactive = f.readline().rstrip()
-    print("Found nonactive color: %s" % str(nonactive))
-    nw = pick_map(builder.name).get(str(nonactive))
-    for worker in workers_list:
-        if nw == worker.worker.workername:
-            f.close()
-            print("Scheduling worker: %s" % str(worker))
-            return worker
-
-    print("Couldn't find the inactive worker, aborting.")
-    f.close()
-    return None
-
-
-BUILDER_BUILDER = util.BuilderConfig(
+TEST_BUILDER = util.BuilderConfig(
     name="test-builder",
-    workernames=["builder-worker-green",
-                 "builder-worker-blue"],
-    nextWorker=pick_inactive_color,
+    workernames=["builder-worker"],
     factory=BUILD_FACTORY)
 
-TESTSWITCHER_BUILDER = util.BuilderConfig(
-    name="testswitcher-builder",
-    workernames=["testswitcher-worker"],
-    factory=TESTSWITCH_FACTORY)
-
 SELENIUM_BUILDER = util.BuilderConfig(
     name="selenium-builder",
     workernames=["selenium-worker"],
@@ -637,7 +568,6 @@ c["builders"] = [
     AUDITOR_BUILDER,
     AUDITOR_BUILDER_DEMO,
     BUILDER_BUILDER,
-    TESTSWITCHER_BUILDER,
     TIP_RESERVE_TOPPER_BUILDER,
     DEMO_SERVICES_CHECKER_BUILDER,
     DOC_BUILDER,

-- 
To stop receiving notification emails like this one, please contact
address@hidden.