X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=2274bccda5d5d8dd50aa6dba715b45a050af4e19;hb=04243d195d192aa62b24baca1ef45efb705eded0;hp=ec3ee9cba18d5e67f6328561e1a8722eb2d222ff;hpb=90d49e6e45883a2ccf8a6e6d7df0532c927fc26f;p=openstack-build%2Fcinder-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index ec3ee9cba..2274bccda 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -1,33 +1,82 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 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
-
-get-orig-source:
-	uscan --verbose --rename --destdir=../build-area
+	dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	rm -rf .testrepository
-	testr init && \
-	set -e && \
-	TEMP_REZ=`mktemp -t` && \
-	testr run --subunit | tee $$TEMP_REZ | subunit2pyunit; \
-	rm -f $$TEMP_REZ
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	@echo "===> Running tests"
+	set -e ; set -x ; for i in 2.7 ; do \
+		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+		echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
+		rm -rf .testrepository ; \
+		testr-python$$PYMAJOR init ; \
+		TEMP_REZ=`mktemp -t` ; \
+		PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit | tee $$TEMP_REZ | subunit2pyunit ; \
+		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
+		rm -f $$TEMP_REZ ; \
+		testr-python$$PYMAJOR slowest ; \
+	done
 endif
 
+override_dh_clean:
+	dh_clean -O--buildsystem=python_distutils
+	rm -f debian/cinder-common.config debian/cinder-common.postinst debian/cinder-api.config debian/cinder-api.postinst debian/cinder-volume.postinst
+	rm -rf debian/*.upstart debian/*.service
+
 override_dh_install:
 	dh_install --fail-missing -Xbin/cinder-all
+	install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
+
+	oslo-config-generator --output-file $(CURDIR)/etc/cinder/cinder.conf.sample \
+		--wrap-width 140 \
+		--namespace cinder \
+		--namespace oslo_concurrency \
+		--namespace oslo_db \
+		--namespace oslo_messaging \
+		--namespace cinder.policy \
+		--namespace keystonemiddleware.auth_token \
+		--namespace cinder.openstack.common.eventlet_backdoor \
+		--namespace cinder.openstack.common.log \
+		--namespace cinder.openstack.common.periodic_task \
+		--namespace cinder.openstack.common.policy \
+		--namespace oslo_db.concurrency
+	install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+
+	# Disable https in default setup, as this makes our CI fail
+	sed -i 's/#auth_protocol=https/auth_protocol=http/' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+
+	# Default to keystone auth
+	sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+
+	# Write only in /var/lib/cinder please
+	sed -i 's|#state_path=$pybasedir|state_path=/var/lib/cinder|' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+
+	# Fix the missing sql_connection directive
+	echo "# Connection to db:" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+	echo "sql_connection = sqlite:////var/lib/cinder/cinderdb" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+
+	install -D -m 0644 $(CURDIR)/etc/cinder/logging_sample.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/logging.conf
 
 override_dh_fixperms:
 	dh_fixperms -Xcinder_tgt.conf
+	chmod 0440 $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
 
-override_dh_clean:
-	# temporary workaround for d2to1 wonkyness
-	dh_clean -Xsetup.cfg
-	rm -f debian/*.init debian/*.service debian/*.upstart
+override_dh_auto_build:
+	dh_auto_build -O--buildsystem=python_distutils
+
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-common.config
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-common.postinst
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-api.config
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-api.postinst
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-volume.postinst
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	python setup.py build_sphinx
+	cp -rf doc/build/html $(CURDIR)/debian/cinder-doc/usr/share/doc/cinder-doc
+	dh_sphinxdoc -O--buildsystem=python_distutils
+endif