X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=cdea67b7b8d99521bbfa120d253b2c4c74c6cf24;hb=40ababf7a3fe6165945c19605ae851b845199f3b;hp=851754cb4ad5788ac86a6d15527a3ce2a6b69f56;hpb=aa72b98d6dff9bd30fe249b193d9d34cc4de66d6;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 851754c..cdea67b 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -12,7 +12,7 @@ export OSLO_PACKAGE_VERSION=$(VERSION)
 override_dh_clean:
 	dh_clean
 	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
@@ -23,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
@@ -32,3 +33,9 @@ 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:
+	./run-tests.sh || true
+	#PYTHONPATH=. nosetests -P || true
+endif