X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=60bf97e9e60a0b753ddeb0716a4781f690057676;hb=a753e558b68d89e010d5a87334217992e2cb7e8b;hp=0ab18541ea815a1f8e73c9a40edef5cba0d27268;hpb=701389b87f42551e0d5d337e3545cc7f566b20af;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 0ab1854..60bf97e 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
@@ -35,6 +36,7 @@ override_dh_auto_clean:
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run-tests.sh || true
+	bash -x ./setup-test-env.sh python setup.py testr --slowest || true
+	#./run-tests.sh || true
 	#PYTHONPATH=. nosetests -P || true
 endif