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

diff --git a/trusty/debian/rules b/trusty/debian/rules
index e53199e..cdea67b 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -4,25 +4,29 @@
 
 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
@@ -30,9 +34,8 @@ override_dh_auto_clean:
 	rm -rf debian/ceilometer-common.postinst
 	find . -iname '*.pyc' -delete
 
-override_dh_gencontrol:
-	if dpkg-vendor --derives-from ubuntu ; then \
-		dh_gencontrol -- -T$(CURDIR)/debian/ubuntu_control_vars ; \
-	else \
-		dh_gencontrol -- -T$(CURDIR)/debian/debian_control_vars ; \
-	fi
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+	./run-tests.sh || true
+	#PYTHONPATH=. nosetests -P || true
+endif