mirror of https://gerrit.osmocom.org/osmo-ci
obs: run_in_docker_and_exit: remove args param
No need to pass args here. It was only used for args.verbose, and that isn't necessary since we don't need to restore the verbose mode. Related: OS#2385 Change-Id: I620cdef46e18f4c66644f14003caf2183c89686f
This commit is contained in:
parent
9ffc482315
commit
10bd88ab54
|
@ -31,7 +31,7 @@ def main():
|
|||
lib.set_cmds_verbose(args.verbose)
|
||||
|
||||
if args.docker:
|
||||
lib.docker.run_in_docker_and_exit(__file__, args)
|
||||
lib.docker.run_in_docker_and_exit(__file__)
|
||||
|
||||
if not args.ignore_req:
|
||||
lib.check_required_programs()
|
||||
|
|
|
@ -28,7 +28,7 @@ def get_oscrc():
|
|||
exit(1)
|
||||
|
||||
|
||||
def run_in_docker_and_exit(script_path, args, add_oscrc=False):
|
||||
def run_in_docker_and_exit(script_path, add_oscrc=False):
|
||||
if "INSIDE_DOCKER" in os.environ:
|
||||
return
|
||||
|
||||
|
@ -41,10 +41,10 @@ def run_in_docker_and_exit(script_path, args, add_oscrc=False):
|
|||
oscrc = get_oscrc()
|
||||
|
||||
# Build the docker image. Unless it is up-to-date, this will take a few
|
||||
# minutes or so, therefore print the output.
|
||||
# minutes or so, therefore print the output. No need to restore
|
||||
# set_cmds_verbose, as we use subprocess.run() below and exit afterwards.
|
||||
lib.set_cmds_verbose(True)
|
||||
build_image()
|
||||
lib.set_cmds_verbose(args.verbose)
|
||||
|
||||
cmd = ["docker", "run",
|
||||
"--rm",
|
||||
|
|
|
@ -202,7 +202,7 @@ def main():
|
|||
lib.set_cmds_verbose(args.verbose)
|
||||
|
||||
if args.docker:
|
||||
lib.docker.run_in_docker_and_exit(__file__, args, True)
|
||||
lib.docker.run_in_docker_and_exit(__file__, True)
|
||||
|
||||
lib.osc.check_proj(proj)
|
||||
lib.osc.check_oscrc()
|
||||
|
|
Loading…
Reference in New Issue