[buildbot] docker: buildslave: make TLS working

LEDE Commits lede-commits at lists.infradead.org
Sat Mar 6 07:08:00 GMT 2021


ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/de80fd33928903e6fd3ec456b908a2968b93df63

commit de80fd33928903e6fd3ec456b908a2968b93df63
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Sat Mar 6 06:45:38 2021 +0100

    docker: buildslave: make TLS working
    
    It seems like twisted actually needs SSL in the connection string,
    otherwise it will get stuck in the following endless loop:
    
     [buildbot_worker.pb.BotFactory#info] Starting factory <buildbot_worker.pb.BotFactory object at 0x7ff40f19e080>
     [twisted.application.internet.ClientService#info] Scheduling retry 1 to connect <twisted.internet.endpoints._WrapperEndpoint object at 0x7ff410352978> in 2.1271975799063436 seconds.
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 docker/buildslave/files/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/buildslave/files/start.sh b/docker/buildslave/files/start.sh
index 20ac53a..01e888e 100644
--- a/docker/buildslave/files/start.sh
+++ b/docker/buildslave/files/start.sh
@@ -20,7 +20,7 @@ use_tls=""
 if [ "$BUILDSLAVE_TLS" = 1 ]; then
 	sed -i \
 		-e 's#(buildmaster_host, port, #(None, None, #' \
-		-e 's#allow_shutdown=allow_shutdown#&, connection_string="TLS:%s:%d:trustRoots=/certs" %(buildmaster_host, port)#' \
+		-e 's#allow_shutdown=allow_shutdown#&, connection_string="SSL:%s:%d" %(buildmaster_host, port)#' \
 		/builder/buildbot.tac
 fi
 



More information about the lede-commits mailing list