X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=7f7a2e41e68e7e1ee0934da349d1a98df4064b65;hb=788cf240a852e9cb5c0a8b9767afb25d4616e482;hp=48e55db96f28d70f1c07c9a37f66d79e8cd42206;hpb=6f1ac728e062ab95655f221a9ed601b1f2ee3184;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 48e55db..7f7a2e4 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -1,25 +1,31 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
+export HOME="$(CURDIR)/debian/test"
 include /usr/share/openstack-pkg-tools/pkgos.make
-
-export OSLO_PACKAGE_VERSION=$(VERSION)
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1)
 
 %:
-	dh $@  --with python2
+	dh $@  --with python2,systemd,sphinxdoc
 
 override_dh_clean:
 	dh_clean
-	rm -rf ceilometer.egg-info
+	rm -rf .testrepository
 	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
+	dh_install --fail-missing
+
+	# Manage ceilometer.conf
+	mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
+	oslo-config-generator --output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
+		--namespace ceilometer \
+		--namespace oslo.db \
+		--namespace oslo.messaging \
+		--namespace oslo.policy \
+		--namespace keystonemiddleware.auth_token
+	sed -i 's|[# \t]*auth_protocol[\t ]*=.*|auth_protocol=http|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+	chmod 0644 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+	sed -i 's|#connection[ \t]*=.*|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
 
 override_dh_auto_build:
 	dh_auto_build
@@ -30,13 +36,26 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf debian/*.upstart
-	rm -rf debian/ceilometer-common.postinst
+	rm -rf .testrepository
 	find . -iname '*.pyc' -delete
+	rm -f debian/*.init debian/*.service debian/*.upstart
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	bash -x ./setup-test-env.sh python setup.py testr --slowest '(?!tests.test_bin)' || true
-	#./run-tests.sh || true
-	#PYTHONPATH=. nosetests -P || true
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	rm -rf .testrepository
+	testr init
+	set -e ; \
+		TEMP_REZ=`mktemp -t` ; \
+		bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!(.*test_bin.*|.*functional.*|.*gabbi\.test_gabbi_prefix.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
+		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
+		rm -f $$TEMP_REZ ;
+	testr slowest
+endif
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build -b html doc/source $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html
+	mkdir -p $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static
+	touch $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static/toggle.js
+	dh_sphinxdoc -O--buildsystem=python_distutils
 endif