phase2: pass buildbot url to cleanup.sh

Instead of hardcoding the REST url in the cleanup script, pass the value
derived from the configuration.

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

diff --git a/phase2/cleanup.sh b/phase2/cleanup.sh
index 989ac5c5ca7d281ab6e29cecd912ceb155aa2821..cd425d121b811ccc7560d2a8aa229f223663ce5d 100755 (executable)
--- a/phase2/cleanup.sh
+++ b/phase2/cleanup.sh
@@ -2,11 +2,12 @@
 
 export LC_ALL=C
 
-current_slave="$1"
-current_builder="$2"
-current_mode="$3"
+buildbot_url="$1"
+current_slave="$2"
+current_builder="$3"
+current_mode="$4"
 
-running_builders="$(wget -qO- "http://phase2.builds.lede-project.org/json/slaves/$current_slave?as_text=1" | sed -ne 's,^.*"builderName": "\(.*\)".*$,\1,p')"
+running_builders="$(wget -qO- "${buildbot_url%/}/json/slaves/$current_slave?as_text=1" | sed -ne 's,^.*"builderName": "\(.*\)".*$,\1,p')"
 
 is_running() {
        local running_builder

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 08c77c1f3aebd30f5630c9d7f08cfd05f71cec1e..ea3e0fb459bbef52f6f9b84061f87f39bf589390 100644 (file)
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -11,6 +11,8 @@ from buildbot import locks
 ini = ConfigParser.ConfigParser()
 ini.read("./config.ini")
 
+buildbot_url = ini.get("general", "buildbot_url")
+
 # This is a sample buildmaster config file. It must be installed as
 # 'master.cfg' in your buildmaster's base directory.
 
@@ -180,14 +182,14 @@ for arch in arches:
        factory.addStep(ShellCommand(
                name = "cleanold",
                description = "Cleaning previous builds",
-               command = ["./cleanup.sh", WithProperties("%(slavename)s"), WithProperties("%(buildername)s"), "full"],
+               command = ["./cleanup.sh", buildbot_url, WithProperties("%(slavename)s"), WithProperties("%(buildername)s"), "full"],
                haltOnFailure = True,
                timeout = 2400))
 
        factory.addStep(ShellCommand(
                name = "cleanup",
                description = "Cleaning work area",
-               command = ["./cleanup.sh", WithProperties("%(slavename)s"), WithProperties("%(buildername)s"), "single"],
+               command = ["./cleanup.sh", buildbot_url, WithProperties("%(slavename)s"), WithProperties("%(buildername)s"), "single"],
                haltOnFailure = True,
                timeout = 2400))
 
@@ -402,7 +404,7 @@ c['titleURL'] = ini.get("general", "title_url")
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
-c['buildbotURL'] = ini.get("general", "buildbot_url")
+c['buildbotURL'] = buildbot_url
 
 ####### DB URL