summaryrefslogtreecommitdiff
path: root/packages/debian
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.ledkov@canonical.com>2014-07-23 17:32:49 +0100
committerDimitri John Ledkov <dimitri.ledkov@canonical.com>2014-07-23 17:32:49 +0100
commit3035b8d90bb8cd3b4a5a75f2014aa4ffdeb42abe (patch)
tree4eb6d2e45ec0ab51f199b786584eb9e7e474b9cf /packages/debian
parent330d35b85bbf0ae90427e4949a18b132378eadbc (diff)
downloadvyos-cloud-init-3035b8d90bb8cd3b4a5a75f2014aa4ffdeb42abe.tar.gz
vyos-cloud-init-3035b8d90bb8cd3b4a5a75f2014aa4ffdeb42abe.zip
use override targets
Diffstat (limited to 'packages/debian')
-rwxr-xr-xpackages/debian/rules8
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/debian/rules b/packages/debian/rules
index 6bf78377..6c3bf526 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
INIT_SYSTEM ?= upstart,systemd
-export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
-export PYBUILD_TEST_NOSE=1
%:
dh $@ --with python2,systemd --buildsystem pybuild
@@ -11,3 +9,9 @@ override_dh_install:
dh_install
install -d debian/cloud-init/etc/rsyslog.d
cp tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
+
+override_dh_auto_test:
+ http_proxy= dh_auto_test -- --test-nose
+
+override_dh_auto_install:
+ dh_auto_install -- --init-system=$(INIT_SYSTEM)