X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Frules;fp=debian%2Frules;h=8bb468438ceea9b98227c9a44902fd766d8a67f6;hb=2ecca9020bea3d1117b35a696e1c612266c58981;hp=d8f39045b96aff0efcdabf600853aa70a643b500;hpb=27103fa9bdb8458dfd22e3eea9f32904c9f8b711;p=openstack-build%2Fceilometer-build.git

diff --git a/debian/rules b/debian/rules
index d8f3904..8bb4684 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,23 +5,37 @@
 
 export HOME="$(CURDIR)/debian/test"
 
+include /usr/share/openstack-pkg-tools/pkgos.make
+
 %:
-	dh $@  --with python2
+	dh $@  --with python2,systemd
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	testr init && PYTHONPATH="$(CURDIR)" testr run || true
+	rm -rf .testrepository
+	testr init && \
+	set -e && \
+		TEMP_REZ=`mktemp -t` && \
+			testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit; \
+	rm -f $$TEMP_REZ
 endif
 
 override_dh_install:
-	cp $(CURDIR)/debian/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
+	oslo-config-generator --output-file etc/ceilometer/ceilometer.conf.sample \
+	    --namespace ceilometer \
+		--namespace oslo.db \
+		--namespace oslo.messaging \
+		--namespace keystonemiddleware.auth_token
+#	patch -p0 < debian/patches/default-config.patch
+	cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
 	dh_install --fail-missing
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f etc/ceilometer/ceilometer.conf
+	rm -f etc/ceilometer/ceilometer.conf etc/ceilometer/ceilometer.conf.sample
 	rm -rf .testrepository
 	rm -rf pbr*.egg
+	rm -f debian/*.init debian/*.service debian/*.upstart