docker: buildslave: make TLS working
authorPetr Štetiar <ynezz@true.cz>
Sat, 6 Mar 2021 05:45:38 +0000 (06:45 +0100)
committerPetr Štetiar <ynezz@true.cz>
Sat, 6 Mar 2021 05:50:04 +0000 (06:50 +0100)
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@true.cz>
docker/buildslave/files/start.sh

index 20ac53a0c8e908220725943c01c4ee6378671010..01e888e96bda673d5491ea7a61ee31eb4e786c1b 100644 (file)
@@ -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