8 files changed, 3 insertions, 64 deletions
diff --git a/README.md b/README.md
index 5173340..2e66f4c 100644
--- a/README.md
+++ b/README.md
@@ -52,4 +52,3 @@ mypy/ -- MARCELLO?
 prepare-* -- MARCELLO?
 pylint/ -- MARCELLO?
 selenium/ -- MARCELLO?
-build-reservetopper -- MARCELLO?
diff --git a/bin/taler-config-generate b/bin/taler-deployment-config-generate
index c5bd947..c5bd947 100755
--- a/bin/taler-config-generate
+++ b/bin/taler-deployment-config-generate
diff --git a/bin/taler-config-instances b/bin/taler-deployment-config-instances
index 924a9ba..924a9ba 100755
--- a/bin/taler-config-instances
+++ b/bin/taler-deployment-config-instances
diff --git a/bin/taler-config-tips b/bin/taler-deployment-config-tips
index a8bcae5..a8bcae5 100755
--- a/bin/taler-config-tips
+++ b/bin/taler-deployment-config-tips
diff --git a/buildbot/create_instances.sh b/buildbot/create_instances.sh
index acdf56b..c67cff6 100755
--- a/buildbot/create_instances.sh
+++ b/buildbot/create_instances.sh
@@ -1,12 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Step for the BUILD_FACTORY running the 'test.taler.net' site.
 set -eu
 
 source "${HOME}/activate"
-# Tolerates "409 Conflict" when one instance is attempted
-# to be created twice.
-taler-config-instances
-
-# Creates one reserve for the survey instance.
-#taler-config-tips
+taler-deployment-config-instances
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 60cfad5..56fa75f 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -77,11 +77,6 @@ c["workers"] = [
     worker.Worker("test-worker", "test-pass"),
 
     ##
-    # Tip reserve toppers.
-    worker.Worker("test-topper-worker", "test-topper-pass"),
-    worker.Worker("demo-topper-worker", "demo-topper-pass"),
-
-    ##
     # This worker compiles the auditor reports for the "green"
     # demo deployment.
     worker.Worker("test-auditor-worker", "test-auditor-pass"),
@@ -254,14 +249,6 @@ DEMO_SERVICES_CHECKER_SCHEDULER = schedulers.Periodic(
     builderNames=["demo-services-checker-builder"]
 )
 
-# We top-up the tipping reserve every 10 days.
-TIP_RESERVE_TOPPER_SCHEDULER = schedulers.Periodic(
-    name="tip-reserve-topper-scheduler",
-    periodicBuildTimer=60 * 60 * 24 * 10,  # 10 days
-    builderNames=["tip-reserve-topper-builder-demo",
-                  "tip-reserve-topper-builder-test"]
-)
-
 # Scheduler that triggers if anything changes
 ALL_SCHEDULER = schedulers.SingleBranchScheduler(
     name="all-scheduler",
@@ -303,14 +290,11 @@ FORCE_SCHEDULER = schedulers.ForceScheduler(
         "wallet-builder",
         "taler-test-healthcheck-builder",
         "taler-demo-healthcheck-builder",
-        "tip-reserve-topper-builder-test",
-        "tip-reserve-topper-builder-demo"
     ]
 )
 
 c["schedulers"] = [
     NIGHTLY_SCHEDULER,
-    TIP_RESERVE_TOPPER_SCHEDULER,
     DEMO_SERVICES_CHECKER_SCHEDULER,
     DOC_SCHEDULER,
     BUILDMASTER_SCHEDULER,
@@ -848,17 +832,6 @@ AUDITOR_FACTORY_DEMO.addStep(
    )
 )
 
-TIP_RESERVE_TOPPER_FACTORY = create_factory_with_deployment()
-TIP_RESERVE_TOPPER_FACTORY.addStep(
-    ShellCommand(
-        name="tip reserve topper",
-        description="Topping the tip reserve.",
-        descriptionDone="Tip reserve has been topped.",
-        command=["./top_reserve.sh"],
-        workdir="../../deployment/buildbot"
-    )
-)
-
 BUILD_FACTORY = create_factory_with_deployment()
 BUILD_FACTORY.addStep(
     ShellCommand(
@@ -1041,18 +1014,6 @@ AUDITOR_BUILDER_DEMO = util.BuilderConfig(
     factory=AUDITOR_FACTORY_DEMO
 )
 
-TIP_RESERVE_TOPPER_BUILDER_DEMO = util.BuilderConfig(
-    name="tip-reserve-topper-builder-demo",
-    workernames=["demo-topper-worker"],
-    factory=TIP_RESERVE_TOPPER_FACTORY
-)
-
-TIP_RESERVE_TOPPER_BUILDER_TEST = util.BuilderConfig(
-    name="tip-reserve-topper-builder-test",
-    workernames=["test-topper-worker"],
-    factory=TIP_RESERVE_TOPPER_FACTORY
-)
-
 DEMO_SERVICES_CHECKER_BUILDER = util.BuilderConfig(
     name="demo-services-checker-builder",
     workernames="demo-worker",
@@ -1105,8 +1066,6 @@ c["builders"] = [
     AUDITOR_BUILDER_TEST,
     AUDITOR_BUILDER_DEMO,
     TEST_BUILDER,
-    TIP_RESERVE_TOPPER_BUILDER_DEMO,
-    TIP_RESERVE_TOPPER_BUILDER_TEST,
     DEMO_SERVICES_CHECKER_BUILDER,
     DOC_BUILDER,
     SITES_BUILDER,
@@ -1221,8 +1180,6 @@ BUILDER_LIST = [
     "auditor-builder-test",
     "auditor-builder-demo",
     "demo-services-checker-builder",
-    "tip-reserve-topper-builder-demo",
-    "tip-reserve-topper-builder-test",
     "sites-builder",
     "test-builder",
     "wallet-builder",
diff --git a/prepare-reservetopper b/prepare-reservetopper
deleted file mode 100755
index c8116e8..0000000
--- a/prepare-reservetopper
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-$HOME/deployment/bootstrap-reservetopper $1
-$HOME/deployment/build-reservetopper
-$HOME/deployment/bin/taler-deployment-config-generate
-
-source $HOME/activate
-priv_filename=$(taler-config -s instance-default -o tip_reserve_priv_filename -f)
-mkdir -p $(dirname $priv_filename)
-cp $HOME/deployment/private-keys/default-tip.priv $priv_filename
diff --git a/systemd-services/config-tips.service b/systemd-services/config-tips.service
index fac80c9..4e9c422 100644
--- a/systemd-services/config-tips.service
+++ b/systemd-services/config-tips.service
@@ -4,4 +4,4 @@ Description=Creates/Pays a new reserve to tip Taler wallets.
 [Service]
 Environment=PATH=%h/local/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONUSERBASE=%h/local
-ExecStart=%h/deployment/bin/taler-config-tips
+ExecStart=%h/deployment/bin/taler-config-deployment-tips