← Back to branch summary

~openstack-charmers-archive/charms/trusty/glance/next

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Ryan Beisner
  • Date: 2015-04-16 21:32:02 UTC
  • mto: This revision was merged to the branch mainline in revision 108.
  • Revision ID: ryan.beisner@canonical.com-20150416213202-bsy0aweb0w27b31n
auto Makefile test target (amulet):  bump juju test timeout to 2700s (same value as the juju-deployer default).  Also remove explicit test names, which will cause all +x files in ./tests to be executed (as bundletester does by default).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
26
26
        # /!\ Note: The -v should only be temporary until Amulet sends
27
27
        # raise_status() messages to stderr:
28
28
        #   https://bugs.launchpad.net/amulet/+bug/1320357
29
 
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 900 \
30
 
        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
31
 
        16-basic-trusty-icehouse-git 17-basic-trusty-juno \
32
 
        18-basic-trusty-juno-git
 
29
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
33
30
 
34
31
publish: lint unit_test
35
32
        bzr push lp:charms/glance