d2to1 and pbr in non-indep build-depends

[openstack-build/ceilometer-build.git] / trusty / debian / rules

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 9bd555f66d0b1229452b87aedb44876dbd28b8b0..0e851ad9c3ca43d97b256eba62351ed08e396bac 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -19,6 +19,7 @@ override_dh_install:
        install -D -m 0644 $(CURDIR)/etc/ceilometer/ceilometer.conf.sample      $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
        install -D -m 0644 $(CURDIR)/etc/ceilometer/policy.json                 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/policy.json
        install -D -m 0644 $(CURDIR)/etc/ceilometer/sources.json                $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/sources.json
+       install -D -m 0644 $(CURDIR)/etc/ceilometer/pipeline.yaml               $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/pipeline.yaml
 
 override_dh_auto_build:
        dh_auto_build
@@ -31,3 +32,8 @@ override_dh_auto_clean:
        rm -rf debian/*.upstart
        rm -rf debian/ceilometer-common.postinst
        find . -iname '*.pyc' -delete
+
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+       PYTHONPATH=. nosetests -P || true
+endif