X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=xenial%2Fdebian%2Frules;h=ec4ccc6c77cd565fced1b4bc80650ef5d5c9da1a;hb=514cf3a8c8735eab23bb3eb6a536d16c54e4ba37;hp=700485d5184adba41c5311c289d6ab569bff102d;hpb=0fdf159a0654c799bfe2f3c39d92e7ef7c3262e9;p=openstack-build%2Fceilometer-build.git

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 700485d..ec4ccc6 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -4,28 +4,39 @@
 
 include /usr/share/openstack-pkg-tools/pkgos.make
 
+export OSLO_PACKAGE_VERSION=$(VERSION)
+
 %:
 	dh $@  --with python2
 
 override_dh_clean:
 	dh_clean
 	rm -rf ceilometer.egg-info
+	rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 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
+	/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
-
-override_dh_installchangelogs:
-	dh_installchangelogs debian/CHANGELOG
+	/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
 
 override_dh_auto_clean:
 	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:
+	bash -x ./setup-test-env.sh python setup.py testr --slowest
+	#./run-tests.sh || true
+	#PYTHONPATH=. nosetests -P || true
+endif