← Back to branch summary

~sseman/juju-ci-tools/add-more-maas-nodes

« back to all changes in this revision

Viewing changes to run_deployer.py

  • Committer: Aaron Bentley
  • Date: 2016-09-20 18:03:54 UTC
  • mfrom: (1575.2.14 soft-timeouts-6)
  • Revision ID: aaron.bentley@canonical.com-20160920180354-7c7o5evlpoabrz9y
Add --timeout to most test scripts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
run_deployer.py
127
127
    args = parse_args(argv)
128
128
    configure_logging(args.verbose)
129
129
    start_juju_path = None if args.upgrade else args.juju_bin
130
 
    client = client_from_config(args.env, start_juju_path, debug=args.debug)
 
130
    client = client_from_config(args.env, start_juju_path, debug=args.debug,
 
131
                                soft_deadline=args.deadline)
131
132
    with boot_context(args.temp_env_name, client, None, [], args.series,
132
133
                      args.agent_url, args.agent_stream, args.logs,
133
134
                      args.keep_env, upload_tools=args.upload_tools,