[buildbot] buildworker: start: fix broken non TLS setups

LEDE Commits lede-commits at lists.infradead.org
Sun Nov 3 22:33:02 PST 2024


ynezz pushed a commit to buildbot.git, branch main:
https://git.openwrt.org/dbf5d03807e66f15b1b661a4fac51c6739cad156

commit dbf5d03807e66f15b1b661a4fac51c6739cad156
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu Oct 24 19:55:04 2024 +0000

    buildworker: start: fix broken non TLS setups
    
    Changes in commit 3812ff7bb296 ("buildworker: start: fix worker startup
    failure after update") broke non TLS setups. So lets fix it by setting
    SSL: only if BUILDWORKER_TLS is set.
    
    Fixes: 3812ff7bb296 ("buildworker: start: fix worker startup failure after update")
    Reported-by: Paul Spooren <mail at aparcar.org>
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 docker/buildworker/files/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/buildworker/files/start.sh b/docker/buildworker/files/start.sh
index 5e0147a..0f50c50 100644
--- a/docker/buildworker/files/start.sh
+++ b/docker/buildworker/files/start.sh
@@ -21,7 +21,7 @@ rm -f /builder/buildbot.tac
 /opt/venv/bin/buildbot-worker create-worker \
 	--force \
 	--umask="0o22" \
-	--connection-string="SSL:$BUILDWORKER_MASTER" \
+	${BUILDWORKER_TLS:+--connection-string="SSL:$BUILDWORKER_MASTER"} \
 	/builder \
 	"$BUILDWORKER_MASTER" \
 	"$BUILDWORKER_NAME" \




More information about the lede-commits mailing list