Sets /etc/ceilometer/pipeline.yaml as conffile and remove handling from the from...

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

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 9bd555f66d0b1229452b87aedb44876dbd28b8b0..0347473d48b2d35c369d1b4ce23a8b130b0766db 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -11,8 +11,9 @@ export OSLO_PACKAGE_VERSION=$(VERSION)
 
 override_dh_clean:
        dh_clean
+       rm -rf .testrepository
        rm -rf ceilometer.egg-info
-       rm -f debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
+       rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
        dh_install
@@ -22,6 +23,7 @@ override_dh_install:
 
 override_dh_auto_build:
        dh_auto_build
+       /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.config
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.postinst
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.config
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.postinst
@@ -31,3 +33,15 @@ override_dh_auto_clean:
        rm -rf debian/*.upstart
        rm -rf debian/ceilometer-common.postinst
        find . -iname '*.pyc' -delete
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+       rm -rf .testrepository
+       testr init
+       set -e && \
+               TEMP_REZ=`mktemp -t` && \
+               bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true ; \
+               cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
+               rm -f $$TEMP_REZ ;
+       testr slowest
+endif