← Back to branch summary

~1chb1n/charms/trusty/swift-storage/amulet-update-1508

« back to all changes in this revision

Viewing changes to Makefile

[beisner,r=james-page] auto normalize amulet test definitions and amulet make targets; charm-helper sync.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
15
15
        # coreycb note: The -v should only be temporary until Amulet sends
16
16
        # raise_status() messages to stderr:
17
17
        #   https://bugs.launchpad.net/amulet/+bug/1320357
18
 
        @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
19
 
        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
 
18
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
20
19
 
21
20
bin/charm_helpers_sync.py:
22
21
        @mkdir -p bin