diff --git a/multibuild.py b/multibuild.py index 4c88bb6..462f8d5 100644 --- a/multibuild.py +++ b/multibuild.py @@ -29,11 +29,6 @@ def find_artifacts(directory="out"): return join(directory, _) -# @util.renderer -# def get_dockerfile_contents(props): -# return _get_dockerfile_contents(props.getProperty('jobname', default=None), util.Interpolate("%(prop:os_codename)s")) - - def add_parent_step(build_factory): """ Add a step to the parent build factory that will trigger the child hooks @@ -41,23 +36,15 @@ def add_parent_step(build_factory): build_factory.addStep(steps.ShellCommand( name="download worker", - command=["wget", "-O", "https://git.bitmessage.org/Bitmessage/buildbot_multibuild/raw/branch/master/lib/worker_multibuild.py", join(getenv['HOME'], '.local/bin/worker_multibuild.py')] + command=["wget", "--force-directories", "-O", "https://git.bitmessage.org/Bitmessage/buildbot_multibuild/raw/branch/master/lib/worker_multibuild.py", join(getenv['HOME'], '.local/bin/worker_multibuild.py')] )) - # build_factory.addStep( - # steps.SetPropertyFromCommand( - # name="Get OS codename", - # command="grep ^VERSION_CODENAME= /etc/os-release | cut -d= -f2", - # property="os_codename", - # ) - # ) - build_factory.addStep( steps.ShellCommand( name="Execute multibuild script", command=[ "python", - "multibuild.py", + join(getenv['HOME'], '.local/bin/worker_multibuild.py'), util.Interpolate("%(prop:jobname)s"), util.Property('repository'), util.Property('branch'),