phase1: make slave port configurable

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/phase1/config.ini.example b/phase1/config.ini.example
index 288b90aaef00270f619bb4490ba745cacea56a8e..6c69ef1d2fae11813ee1c28e10432d3df63e79e2 100644 (file)
--- 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 7e74bd39f7a0c438ff1d8b5bed547e67a1d99065..1e8e54e0ac4a5041ff9de1083c4c462e5a757db5 100644 (file)
--- 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