Generating config file from script, since it's gone from upstream.

[openstack-build/ceilometer-build.git] / trusty / debian / rules

diff --git a/trusty/debian/rules b/trusty/debian/rules
index d7f7d6dcdb554fddbac5abee594388d040411453..bf169c2e474146dbc35ac1587ef6a9dbcc09acac 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -17,10 +17,9 @@ override_dh_clean:
 
 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
+       PYTHONPATH=. bash tools/config/generate_sample.sh -b . -p ceilometer -o $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
+       mv $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+       chmod 0644 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
 
 override_dh_auto_build:
        dh_auto_build
@@ -39,7 +38,10 @@ override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
        rm -rf .testrepository
        testr init
-       bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true
-       test slowest
-       testr last --subunit | subunit-filter -s --no-passthrough | subunit-stats
+       set -e && \
+               TEMP_REZ=`mktemp -t` && \
+               bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true ; \
+               cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
+               rm -f $$TEMP_REZ ;
+       testr slowest
 endif