From 17bc49bafc967c95b0c7e4400b8353dcf7cd2802 Mon Sep 17 00:00:00 2001 From: Muzahid Date: Mon, 21 Feb 2022 15:18:54 +0530 Subject: [PATCH] minor changes for passing args --- lib/worker_multibuild.py | 2 +- multibuild.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index c59453a..ff05eaf 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -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 """ diff --git a/multibuild.py b/multibuild.py index 48415db..c1ea83e 100644 --- a/multibuild.py +++ b/multibuild.py @@ -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"),