From 3294e6522ba4639de4591443e2ded312943fbb67 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 14 Nov 2016 13:46:07 +0100 Subject: [PATCH] phase2: make slave port configurable Signed-off-by: Jo-Philipp Wich --- phase2/config.ini.example | 1 + phase2/master.cfg | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/phase2/config.ini.example b/phase2/config.ini.example index edffc99..9fee514 100644 --- a/phase2/config.ini.example +++ b/phase2/config.ini.example @@ -3,6 +3,7 @@ title = LEDE Project title_url = http://lede-project.org/ buildbot_url = http://phase2.builds.lede-project.org/ homedir = ../phase1 +port = 9990 [status] bind = tcp:8011:interface=127.0.0.1 diff --git a/phase2/master.cfg b/phase2/master.cfg index f460ded..f12e479 100644 --- a/phase2/master.cfg +++ b/phase2/master.cfg @@ -25,6 +25,11 @@ c = BuildmasterConfig = {} # slave name and password must be configured on the slave. from buildbot.buildslave import BuildSlave +slave_port = 9990 + +if ini.has_option("general", "port"): + slave_port = ini.getint("general", "port") + c['slaves'] = [] for section in ini.sections(): @@ -40,7 +45,7 @@ for section in ini.sections(): # 'slavePortnum' defines the TCP port to listen on for connections from slaves. # This must match the value configured into the buildslaves (with their # --master option) -c['slavePortnum'] = 9990 +c['slavePortnum'] = slave_port # coalesce builds c['mergeRequests'] = True -- 2.30.2