remove extra args
This commit is contained in:
parent
48c2499cb2
commit
86614fc2e9
|
@ -97,9 +97,8 @@ def _get_dockerfile_contents(jobname):
|
||||||
return res + dockerfile_extra_contents[os_codename]
|
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
|
request_url = buildbotUrl + ty
|
||||||
os_codename='bionic'
|
|
||||||
# List all jobs in the directory
|
# List all jobs in the directory
|
||||||
jobs = list_jobs(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),
|
"test_script_available": is_test_script_available(test_script_exists),
|
||||||
"repository": repository,
|
"repository": repository,
|
||||||
"branch": branch,
|
"branch": branch,
|
||||||
"jobname": jobname,
|
"jobname": job,
|
||||||
}
|
}
|
||||||
requests.post(request_url, headers=request_headers, data=request_data)
|
requests.post(request_url, headers=request_headers, data=request_data)
|
||||||
|
|
|
@ -55,8 +55,7 @@ def add_parent_step(build_factory):
|
||||||
join(getenv['HOME'], '.local/bin/worker_multibuild.py'),
|
join(getenv['HOME'], '.local/bin/worker_multibuild.py'),
|
||||||
util.Property('repository'),
|
util.Property('repository'),
|
||||||
util.Property('branch'),
|
util.Property('branch'),
|
||||||
util.getURLForBuild(util, util.Property("builderid"), util.Property("buildnumber")),
|
util.getURLForBuild(util.Property("url"), util.Property("builderid"), util.Property("buildnumber")),
|
||||||
os_codename,
|
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -96,7 +95,7 @@ if __name__ == "__main__":
|
||||||
branch = sys.argv[3]
|
branch = sys.argv[3]
|
||||||
buildbotUrl = sys.argv[4]
|
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:
|
else:
|
||||||
print(
|
print(
|
||||||
"Usage: python3 multibuild.py <jobname> <repository> <branch> <buildbotUrl> "
|
"Usage: python3 multibuild.py <jobname> <repository> <branch> <buildbotUrl> "
|
||||||
|
|
Loading…
Reference in New Issue
Block a user