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 a7c8a708e5c991b7549cca01f5689af7770cc23e..0347473d48b2d35c369d1b4ce23a8b130b0766db 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -20,7 +20,6 @@ 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
@@ -39,7 +38,10 @@ override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
        rm -rf .testrepository
        testr init
-       bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | subunit2pyunit || true
+       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
-       testr last --subunit | subunit-filter -s --no-passthrough | subunit-stats
 endif