← Back to branch summary

~veebers/juju-ci-tools/model_migration_check_all_units_of_charm

« back to all changes in this revision

Viewing changes to deploy_stack.py

  • Committer: Andrew Beach
  • Date: 2016-12-16 16:03:27 UTC
  • mfrom: (1819 trunk)
  • mto: This revision was merged to the branch mainline in revision 1820.
  • Revision ID: andrew.beach@canonical.com-20161216160327-r3p7i785yyu7pnvh
Updated with changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
deploy_stack.py
1072
1072
            deploy_dummy_stack(client, charm_series, args.use_charmstore)
1073
1073
        assess_juju_relations(client)
1074
1074
        skip_juju_run = (
1075
 
            (client.version < "2" and sys.platform in ("win32", "darwin"))
1076
 
            or charm_series.startswith(("centos", "win")))
 
1075
            (client.version < "2" and sys.platform in ("win32", "darwin")) or
 
1076
            charm_series.startswith(("centos", "win")))
1077
1077
        if not skip_juju_run:
1078
1078
            assess_juju_run(client)
1079
1079
        if args.upgrade: