Bitmessage
/
buildbot_multibuild
4
0
Fork 5
Code Issues 4 Pull Requests Projects Releases Wiki Activity

minor changes for passing args

This commit is contained in:
Muzahid 2022-02-21 15:18:54 +05:30
parent 4d1957712d
commit 17bc49bafc
Signed by: cis-muzahid
GPG Key ID: 1DC85E7D3AB613EA
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/worker_multibuild.py
View File

@ -69,7 +69,7 @@ def list_jobs(directory=".buildbot"):
return results
def _get_dockerfile_contents(props, jobname, os_codename):
def _get_dockerfile_contents(jobname, os_codename):
"""
Read contents of a Dockerfile and add extra contents for the given os_codename
"""

13
multibuild.py
View File

@ -31,13 +31,19 @@ def find_artifacts(directory="out"):
@util.renderer
def get_dockerfile_contents(props):
return _get_dockerfile_contents(props, props.getProperty('jobname', default=None), util.Interpolate("%(prop:os_codename)s"))
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
"""
build_factory.addStep(steps.ShellCommand(
name="download worker",
command=["sudo", "wget", "-O", "https://git.bitmessage.org/Bitmessage/buildbot_multibuild/raw/branch/master/lib/worker_multibuild.py", "worker_multibuild.py"]
))
build_factory.addStep(
steps.SetPropertyFromCommand(
name="Get OS codename",
@ -67,11 +73,6 @@ def add_child_sh_steps(build_factory, directory=".buildbot"):
Add a step to the download, build and test factory
"""
build_factory.addStep(steps.ShellCommand(
name="download worker",
command=["sudo", "wget", "-O", "https://git.bitmessage.org/Bitmessage/buildbot_multibuild/raw/branch/master/lib/worker_multibuild.py", "worker_multibuild.py"]
))
build_factory.addStep(
steps.ShellCommand(
name=util.Interpolate("build_%(prop:jobname)s"),