← Back to branch summary

~corey.bryant/charms/trusty/nova-compute/amulet-novacc

« back to all changes in this revision

Viewing changes to Makefile

[1chb1n, r=gnuoy] 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
23
23
        # coreycb note: The -v should only be temporary until Amulet sends
24
24
        # raise_status() messages to stderr:
25
25
        #   https://bugs.launchpad.net/amulet/+bug/1320357
26
 
        @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
27
 
        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
28
 
        16-basic-trusty-icehouse-git 17-basic-trusty-juno \
29
 
        18-basic-trusty-juno-git
 
26
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
30
27
 
31
28
publish: lint unit_test
32
29
        bzr push lp:charms/nova-compute