small changes
This commit is contained in:
parent
5a9465a02d
commit
01e2caa8f5
|
@ -69,10 +69,11 @@ def list_jobs(directory=".buildbot"):
|
||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
def _get_dockerfile_contents(jobname, os_codename='bionic'):
|
def _get_dockerfile_contents(jobname):
|
||||||
"""
|
"""
|
||||||
Read contents of a Dockerfile and add extra contents for the given os_codename
|
Read contents of a Dockerfile and add extra contents for the given os_codename
|
||||||
"""
|
"""
|
||||||
|
os_codename='bionic'
|
||||||
res = ""
|
res = ""
|
||||||
with open(join(path + jobname), "r") as file:
|
with open(join(path + jobname), "r") as file:
|
||||||
contents = file.read()
|
contents = file.read()
|
||||||
|
@ -91,9 +92,9 @@ def _get_dockerfile_contents(jobname, os_codename='bionic'):
|
||||||
return res + dockerfile_extra_contents[os_codename]
|
return res + dockerfile_extra_contents[os_codename]
|
||||||
|
|
||||||
|
|
||||||
def trigger_child_hooks(buildbotUrl: str, os_codename: str, repository, branch, jobname, directory=".buildbot", is_build_script_available, is_test_script_available):
|
def trigger_child_hooks(buildbotUrl: str, repository, branch, jobname, directory=".buildbot", is_build_script_available, is_test_script_available):
|
||||||
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)
|
||||||
|
|
||||||
|
@ -109,7 +110,7 @@ def trigger_child_hooks(buildbotUrl: str, os_codename: str, repository, branch,
|
||||||
# make a post request
|
# make a post request
|
||||||
request_data["properties"] = {
|
request_data["properties"] = {
|
||||||
"dockerfile": _get_dockerfile_contents(
|
"dockerfile": _get_dockerfile_contents(
|
||||||
join(directory, job, "Dockerfile"), os_codename
|
join(directory, job, "Dockerfile")
|
||||||
),
|
),
|
||||||
"build_script_available": is_build_script_available(build_script_exists),
|
"build_script_available": is_build_script_available(build_script_exists),
|
||||||
"test_script_available": is_test_script_available(test_script_exists),
|
"test_script_available": is_test_script_available(test_script_exists),
|
||||||
|
|
|
@ -36,7 +36,7 @@ def add_parent_step(build_factory):
|
||||||
|
|
||||||
build_factory.addStep(steps.ShellCommand(
|
build_factory.addStep(steps.ShellCommand(
|
||||||
name="download worker",
|
name="download worker",
|
||||||
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')]
|
command=["mkdir", "-p", join(getenv['HOME'], '.local/bin'), "&&", "wget", "-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(
|
build_factory.addStep(
|
||||||
|
@ -80,7 +80,7 @@ def add_child_sh_steps(build_factory, directory=".buildbot"):
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
# expect jobname, repository, branch, buildbotUrl, os_codename from command line
|
# expect jobname, repository, branch, buildbotUrl from command line
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if len(sys.argv) == 6:
|
if len(sys.argv) == 6:
|
||||||
|
@ -88,10 +88,9 @@ if __name__ == "__main__":
|
||||||
repository = sys.argv[2]
|
repository = sys.argv[2]
|
||||||
branch = sys.argv[3]
|
branch = sys.argv[3]
|
||||||
buildbotUrl = sys.argv[4]
|
buildbotUrl = sys.argv[4]
|
||||||
os_codename = sys.argv[5]
|
|
||||||
|
|
||||||
trigger_child_hooks(buildbotUrl, os_codename, repository, branch, jobname, ".buildbot", is_build_script_available, is_test_script_available)
|
trigger_child_hooks(buildbotUrl, repository, branch, jobname, ".buildbot", is_build_script_available, is_test_script_available)
|
||||||
else:
|
else:
|
||||||
print(
|
print(
|
||||||
"Usage: python3 multibuild.py <jobname> <repository> <branch> <buildbotUrl> <os_codename>"
|
"Usage: python3 multibuild.py <jobname> <repository> <branch> <buildbotUrl> "
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user