← Back to branch summary

~landscape/charms/trusty/nova-charm-controller/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: james.page at ubuntu
  • Date: 2015-04-20 10:21:36 UTC
  • Revision ID: james.page@ubuntu.com-20150420102136-uj9hjyr5llwmjf59
Revert previous commit, work incomplete

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
2
2
PYTHON := /usr/bin/env python
3
3
 
4
4
lint:
5
 
        @flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests
 
5
        @flake8 --exclude hooks/charmhelpers hooks unit_tests tests
6
6
        @charm proof
7
7
 
8
8
unit_test:
18
18
        # coreycb note: The -v should only be temporary until Amulet sends
19
19
        # raise_status() messages to stderr:
20
20
        #   https://bugs.launchpad.net/amulet/+bug/1320357
21
 
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700 \
22
 
        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
23
 
        16-basic-trusty-icehouse-git 17-basic-trusty-juno \
24
 
        18-basic-trusty-juno-git
 
21
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
25
22
 
26
23
sync: bin/charm_helpers_sync.py
27
24
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml