Build ceilometer 2015.1.0 (stable/kilo)

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

diff --git a/debian/rules b/trusty/debian/rules
similarity index 88%
rename from debian/rules
rename to trusty/debian/rules
index 8bb468438ceea9b98227c9a44902fd766d8a67f6..a6047da044c9538e169a0069580595a1a3f8756b 100755 (executable)
--- a/debian/rules
+++ b/trusty/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_test:
        testr init && \
        set -e && \
                TEMP_REZ=`mktemp -t` && \
-                       testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit; \
+                       testr run --subunit 'tests\.(?!.*test_bin.*)(?!.*test_gabbi.*)' | tee $$TEMP_REZ | subunit2pyunit; \
        rm -f $$TEMP_REZ
 endif
 
@@ -29,7 +29,6 @@ override_dh_install:
                --namespace oslo.db \
                --namespace oslo.messaging \
                --namespace keystonemiddleware.auth_token
-#      patch -p0 < debian/patches/default-config.patch
        cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
        dh_install --fail-missing