X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=7b6e2dfa21be50475fc4dfdc33d892ecc0fc7e6e;hb=378bac3ef6a5faf59b1722d186df3db8c01c13d3;hp=a6047da044c9538e169a0069580595a1a3f8756b;hpb=9ed9a8077046102d4b1ac5edc630b266fe7063d8;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index a6047da..7b6e2df 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -1,40 +1,63 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 export HOME="$(CURDIR)/debian/test"
-
 include /usr/share/openstack-pkg-tools/pkgos.make
+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,systemd
+	dh $@  --with python2,systemd,sphinxdoc
 
-get-orig-source:
-	uscan --verbose --force-download --rename --destdir=../build-area
-
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
+override_dh_clean:
+	dh_clean
 	rm -rf .testrepository
-	testr init && \
-	set -e && \
-		TEMP_REZ=`mktemp -t` && \
-			testr run --subunit 'tests\.(?!.*test_bin.*)(?!.*test_gabbi.*)' | tee $$TEMP_REZ | subunit2pyunit; \
-	rm -f $$TEMP_REZ
-endif
+	rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
-	oslo-config-generator --output-file etc/ceilometer/ceilometer.conf.sample \
-	    --namespace ceilometer \
+	dh_install --fail-missing
+
+	# Manage ceilometer.conf
+	mkdir -p $(CURDIR)/debian/ceilometer-common/etc/ceilometer
+	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
-	cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
-	dh_install --fail-missing
+	#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
+	cp -a $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf $(CURDIR)/debian/ceilometer-common/etc/ceilometer/
+
+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
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f etc/ceilometer/ceilometer.conf etc/ceilometer/ceilometer.conf.sample
 	rm -rf .testrepository
-	rm -rf pbr*.egg
+	find . -iname '*.pyc' -delete
 	rm -f debian/*.init debian/*.service debian/*.upstart
+
+override_dh_auto_test:
+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