← Back to branch summary

~landscape/landscape-charm/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Simon Poirier
  • Date: 2021-07-29 01:19:51 UTC
  • mfrom: (404.1.1 juju-deploy-err)
  • Revision ID: simon.poirier@canonical.com-20210729011951-slmwsnrpbl4oxlen
Merge juju-deploy-err [f=] [r=maxiberta] [a=Simon Poirier]
Replace juju-deployer by plain "juju deploy" in integration tests to allow testing on bionic.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
PYTHON := /usr/bin/env python
2
2
 
3
3
test:
4
 
        trial lib
 
4
        PYTHONPATH=. trial lib
5
5
        # For now only the install hook runs against python3
6
 
        trial3 lib/tests/test_apt.py lib/tests/test_install.py
 
6
        PYTHONPATH=. trial3 lib/tests/test_apt.py lib/tests/test_install.py
7
7
 
8
8
ci-test:
9
9
        ./dev/ubuntu-deps
15
15
                apache2 postgresql juju-gui haproxy rabbitmq-server nfs
16
16
 
17
17
test-depends: bundles
18
 
        pip install --user bundletester juju-deployer
19
 
        pip3 install --user amulet
 
18
        PIP_IGNORE_INSTALLED=0 pip3 install --user amulet
20
19
        cd tests && python3 test_helpers.py
21
20
 
22
21
bundles-checkout:
31
30
bundles: bundles-checkout
32
31
        bundles/render-bundles
33
32
 
34
 
bundles-local-branch: bundles-checkout
35
 
        bundles/render-bundles --landscape-branch $(CURDIR)
36
 
 
37
33
bundles-local-charm: bundles-checkout
38
34
        bundles/render-bundles --landscape-charm $(CURDIR)
39
35
 
45
41
        fi
46
42
 
47
43
integration-test: test-depends
48
 
        python2 ~/.local/bin/bundletester -v -l DEBUG --skip-implicit -t .
 
44
        ./tests/01-basic
49
45
 
50
46
# Run integration tests using the LDS package from the lds-trunk PPA
51
47
integration-test-trunk: secrets
52
48
        LS_CHARM_SOURCE=lds-trunk-ppa $(MAKE) $(subst -trunk,,$@)
53
49
 
54
 
deploy-dense-maas: bundles-local-branch config
 
50
deploy-dense-maas: bundles-local-charm config
55
51
        ./dev/deployer dense-maas
56
52
 
57
 
deploy-dense-maas-dev: bundles-local-branch config repo-file-trunk
 
53
deploy-dense-maas-dev: bundles-local-charm config repo-file-trunk
58
54
        ./dev/deployer dense-maas --flags juju-debug
59
55
 
60
 
deploy: bundles-local-branch
 
56
deploy: bundles-local-charm
61
57
        ./dev/deployer scalable
62
58
 
63
59
repo-file-trunk: secrets config