From c0aabccc93cfbb27238286a36271893333b99443 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 14 Nov 2016 13:43:55 +0100 Subject: [PATCH] phase1: make slave port configurable Signed-off-by: Jo-Philipp Wich --- phase1/config.ini.example | 1 + phase1/master.cfg | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/phase1/config.ini.example b/phase1/config.ini.example index 288b90a..6c69ef1 100644 --- a/phase1/config.ini.example +++ b/phase1/config.ini.example @@ -4,6 +4,7 @@ title_url = http://lede-project.org/ buildbot_url = http://phase1.builds.lede-project.org/ homedir = . expire = 1209600 +port = 9989 [status] bind = tcp:8010:interface=127.0.0.1 diff --git a/phase1/master.cfg b/phase1/master.cfg index 7e74bd3..1e8e54e 100644 --- a/phase1/master.cfg +++ b/phase1/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 = 9989 + +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'] = 9989 +c['slavePortnum'] = slave_port # coalesce builds c['mergeRequests'] = True -- 2.30.2