← Back to branch summary

~corey.bryant/charms/trusty/keystone/amulet-git-fixups

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Corey Bryant
  • Date: 2015-03-13 09:52:11 UTC
  • mto: This revision was merged to the branch mainline in revision 142.
  • Revision ID: corey.bryant@canonical.com-20150313095211-j0lho03pviv80jlw
Add deploy from source action support and various fixups after rebase

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 hooks unit_tests tests
 
5
        @flake8 --exclude hooks/charmhelpers actions/* hooks unit_tests tests
6
6
        @charm proof
7
7
 
8
8
unit_test:
15
15
        # raise_status() messages to stderr:
16
16
        #   https://bugs.launchpad.net/amulet/+bug/1320357
17
17
        @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
18
 
        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
 
18
        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
 
19
        16-basic-trusty-icehouse-git 17-basic-trusty-juno \
 
20
        18-basic-trusty-juno-git
19
21
 
20
22
bin/charm_helpers_sync.py:
21
23
        @mkdir -p bin
26
28
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
27
29
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
28
30
 
29
 
publish: lint test
 
31
publish: lint unit_test
30
32
        bzr push lp:charms/keystone
31
33
        bzr push lp:charms/trusty/keystone