← Back to branch summary

~ubuntu-branches/ubuntu/utopic/maas/utopic

« back to all changes in this revision

Viewing changes to acceptance/Makefile

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2014-02-15 16:16:38 UTC
  • mfrom: (1.2.23)
  • Revision ID: package-import@ubuntu.com-20140215161638-80d2hs4neqn53qj4
Tags: 1.5+bzr1951-0ubuntu1
* New upstream release
* debian/maas-cluster-controller.postinst: Also authbind port 69.
* debian/maas-cluster-controller.maas-pserv.upstart: Export MAAS_URL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
acceptance/Makefile
33
33
 
34
34
# The container on which to base ephemerals.
35
35
container := maas-$(series)
36
 
containerdir := /var/lib/lxc/$(container)
37
36
 
38
37
## Convenience definitions.
39
38
 
40
39
define ephexec
41
40
sudo LC_ALL=C SSH_ASKPASS=$(abspath ubuntupass) setsid \
42
41
    lxc-start-ephemeral -b $(upstream) -o $(container) -u ubuntu -- \
43
 
    DEBIAN_FRONTEND=noninteractive SUDO_ASKPASS=$(abspath ubuntupass)
 
42
    env DEBIAN_FRONTEND=noninteractive SUDO_ASKPASS=$(abspath ubuntupass)
44
43
endef
45
44
 
46
45
define ephexec-make
53
52
 
54
53
## Top-level targets.
55
54
 
56
 
test: build | services sudo container
 
55
test: build | services sudo container-updated
57
56
        $(ephexec-make) $@-inner
58
57
 
59
58
# lxc-start-ephemeral does not return the exit code of any command it
65
64
        @ls -1 *.deb
66
65
        @touch $@
67
66
 
68
 
container: $(containerdir)
 
67
container: | services sudo
 
68
        test -n "$$(sudo lxc-ls -1 $(container))" || \
 
69
            sudo lxc-create -n $(container) -f /etc/lxc/default.conf \
 
70
                -t ubuntu -- --release $(series)
69
71
 
70
 
container-update: $(containerdir) | services sudo
 
72
container-updated: container | services sudo
71
73
        $(abspath update-container) $(container)
72
74
 
73
75
services:
76
78
 
77
79
define phony-outer-targets
78
80
  container
79
 
  container-update
 
81
  container-updated
80
82
  services
81
83
  test
82
84
endef
124
126
source/debian: | source
125
127
        bzr export $@ $(packaging)/debian
126
128
 
127
 
$(containerdir): | services sudo
128
 
        sudo lxc-create -n $(container) \
129
 
            -f /etc/lxc/default.conf -t ubuntu -- --release $(series)
130
 
        $(abspath update-container) $(container)
131
 
 
132
129
## Miscellaneous.
133
130
 
134
131
sudo: