X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=e6df3bf7cce68f1d5e0d3d1df84a15f3b8eb01cc;hb=f58b12d94294b712587a470ca04e894b7939feb1;hp=a7c8a708e5c991b7549cca01f5689af7770cc23e;hpb=9b87b75a75760b5f0efd70a6b95cbcf909a6bb99;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index a7c8a70..e6df3bf 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -18,9 +18,6 @@ override_dh_clean:
 override_dh_install:
 	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 +36,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