From 86614fc2e9859971f5753e1773f4dd6a6b13bce1 Mon Sep 17 00:00:00 2001 From: Muzahid Date: Tue, 8 Mar 2022 20:57:52 +0530 Subject: [PATCH] remove extra args --- lib/worker_multibuild.py | 5 ++--- multibuild.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index 8aa55ea..1dfdcbf 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -97,9 +97,8 @@ def _get_dockerfile_contents(jobname): return res + dockerfile_extra_contents[os_codename] -def trigger_child_hooks(buildbotUrl: str, repository, branch, jobname, directory=".buildbot", is_build_script_available, is_test_script_available): +def trigger_child_hooks(buildbotUrl: str, repository, branch, directory=".buildbot"): request_url = buildbotUrl + ty - os_codename='bionic' # List all jobs in the directory jobs = list_jobs(directory) @@ -121,6 +120,6 @@ def trigger_child_hooks(buildbotUrl: str, repository, branch, jobname, directory "test_script_available": is_test_script_available(test_script_exists), "repository": repository, "branch": branch, - "jobname": jobname, + "jobname": job, } requests.post(request_url, headers=request_headers, data=request_data) diff --git a/multibuild.py b/multibuild.py index 4aa011e..91d2bfc 100644 --- a/multibuild.py +++ b/multibuild.py @@ -55,8 +55,7 @@ def add_parent_step(build_factory): join(getenv['HOME'], '.local/bin/worker_multibuild.py'), util.Property('repository'), util.Property('branch'), - util.getURLForBuild(util, util.Property("builderid"), util.Property("buildnumber")), - os_codename, + util.getURLForBuild(util.Property("url"), util.Property("builderid"), util.Property("buildnumber")), ], ) ) @@ -96,7 +95,7 @@ if __name__ == "__main__": branch = sys.argv[3] buildbotUrl = sys.argv[4] - trigger_child_hooks(buildbotUrl, repository, branch, jobname, ".buildbot", is_build_script_available, is_test_script_available) + trigger_child_hooks(buildbotUrl, repository, branch, ".buildbot") else: print( "Usage: python3 multibuild.py "