summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorms <ms@taler.net>2021-07-01 15:39:01 +0200
committerms <ms@taler.net>2021-07-01 15:39:01 +0200
commit73c4c65079ce65edcb2a0d4e4ce6153f718fbfed (patch)
tree9fdc507c8740216787b11aecaf3a98c3caeb6da5
parent941507670fa3275c863e88fefff10cfd14e98f05 (diff)
downloaddeployment-73c4c65079ce65edcb2a0d4e4ce6153f718fbfed.tar.gz
deployment-73c4c65079ce65edcb2a0d4e4ce6153f718fbfed.tar.bz2
deployment-73c4c65079ce65edcb2a0d4e4ce6153f718fbfed.zip
tips checker needs dedicate worker.
Mainly because it depends on the 'activate' script that populates the environment with the merchant API key. It would not be possible to query the state of tip reserves without such key.
-rwxr-xr-xbin/taler-deployment4
-rw-r--r--buildbot/master.cfg5
-rw-r--r--systemd-services/tips-checker.service13
3 files changed, 20 insertions, 2 deletions
diff --git a/bin/taler-deployment b/bin/taler-deployment
index 331daf7..b4c74c5 100755
--- a/bin/taler-deployment
+++ b/bin/taler-deployment
@@ -716,6 +716,10 @@ def bootstrap() -> None:
(home / "taler-data").mkdir(parents=True, exist_ok=True)
if envname == "demo":
setup_service("config-tips.timer")
+ create_bb_worker(
+ "tips-checker.service", "tips-checker-dir",
+ "tips-checker-worker", "tips-checker-pass"
+ )
if not (home / "taler-data").exists():
(home / "taler-data").symlink_to("/home/demo/shared-data")
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index f97177a..2fe5a37 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -882,8 +882,8 @@ CODECHANGE_TRIGGERS.append("codespell-builder")
##
# This worker checks that all the services run under the
# 'demo' deployment are up&running.
-WORKERS.append(worker.Worker("demo-worker", "demo-pass"))
+WORKERS.append(worker.Worker("tips-checker-worker", "tips-checker-pass"))
DEMO_CHECK_TIPS_FACTORY = create_factory_with_deployment()
DEMO_CHECK_TIPS_FACTORY.addStep(
ShellCommand(
@@ -898,6 +898,7 @@ DEMO_CHECK_TIPS_FACTORY.addStep(
)
)
+WORKERS.append(worker.Worker("demo-worker", "demo-pass"))
DEMO_SERVICES_INTEGRATIONTEST_FACTORY = create_factory_with_deployment()
DEMO_SERVICES_INTEGRATIONTEST_FACTORY.addStep(
ShellCommand(
@@ -918,7 +919,7 @@ BUILDERS.append(util.BuilderConfig(
))
BUILDERS.append(util.BuilderConfig(
name="check-tips-builder",
- workernames="demo-worker",
+ workernames="tips-checker-worker",
factory=DEMO_CHECK_TIPS_FACTORY
))
EMAIL_ALERTS.append("demo-services-checker-builder")
diff --git a/systemd-services/tips-checker.service b/systemd-services/tips-checker.service
new file mode 100644
index 0000000..d7a0118
--- /dev/null
+++ b/systemd-services/tips-checker.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Buildbot worker service for the integration test
+AssertPathExists=%h/worker
+
+[Service]
+WorkingDirectory=%h
+ExecStart=/usr/bin/buildbot-worker start --nodaemon tips-checker-dir
+ExecReload=/usr/bin/buildbot-worker restart --nodaemon tips-checker-dir
+ExecStop=/usr/bin/buildbot-worker stop tips-checker-dir
+Restart=always
+
+[Install]
+WantedBy=default.target