From 3812ff7bb296d392d3393f919336e73425144f23 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Thu, 26 Sep 2024 21:04:00 +0000 Subject: [PATCH] buildworker: start: fix worker startup failure after update MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Workers are currently refusing to work: Unhandled Error Traceback (most recent call last): File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 673, in run runApp(config) File "/opt/venv/lib/python3.11/site-packages/twisted/scripts/twistd.py", line 29, in runApp runner.run() File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 370, in run self.application = self.createOrGetApplication() File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 437, in createOrGetApplication application = getApplication(self.config, passphrase) --- --- File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 446, in getApplication application = service.loadApplication(filename, style, passphrase) File "/opt/venv/lib/python3.11/site-packages/twisted/application/service.py", line 404, in loadApplication application = sob.loadValueFromFile(filename, "application") File "/opt/venv/lib/python3.11/site-packages/twisted/persisted/sob.py", line 174, in loadValueFromFile codeObj = compile(data, filename, "exec") builtins.SyntaxError: keyword argument repeated: connection_string (buildbot.tac, line 49) as the buildbot.tac template changed in commit 4ba1dcb66155 ("worker: Add option --connection-string for create-worker") and in version v3.10.0. So lets use this new `--connection-string` feature and get rid of the sed-fu. Fixes: efbddc90d8e6 ("Bump buildbot to v3.11.1 release") Signed-off-by: Petr Å tetiar --- docker/buildworker/files/start.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/docker/buildworker/files/start.sh b/docker/buildworker/files/start.sh index ef419d2..1034407 100644 --- a/docker/buildworker/files/start.sh +++ b/docker/buildworker/files/start.sh @@ -12,17 +12,14 @@ rm -f /builder/buildbot.tac -use_tls="" -[ "$BUILDWORKER_TLS" = 1 ] && use_tls="--use-tls" -/opt/venv/bin/buildbot-worker create-worker --force --umask="0o22" $use_tls /builder \ - "$BUILDWORKER_MASTER" "$BUILDWORKER_NAME" "$BUILDWORKER_PASSWORD" - -if [ "$BUILDWORKER_TLS" = 1 ]; then - sed -i \ - -e 's#(buildmaster_host, port, #(None, None, #' \ - -e 's#allow_shutdown=allow_shutdown#&, connection_string="SSL:%s:%d" %(buildmaster_host, port)#' \ - /builder/buildbot.tac -fi +/opt/venv/bin/buildbot-worker create-worker \ + --force \ + --umask="0o22" \ + --connection-string="SSL:$BUILDWORKER_MASTER" \ + /builder \ + "$BUILDWORKER_MASTER" \ + "$BUILDWORKER_NAME" \ + "$BUILDWORKER_PASSWORD" echo "$BUILDWORKER_ADMIN" > /builder/info/admin echo "$BUILDWORKER_DESCRIPTION" > /builder/info/host -- 2.30.2