Code Review
/
openstack-build
/
ceilometer-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix DAEMON_ARGS for agents.
[openstack-build/ceilometer-build.git]
/
trusty
/
debian
/
rules
diff --git
a/trusty/debian/rules
b/trusty/debian/rules
index 94822756c5c88f21275f6d00faf2bbde67e3b49e..7f7a2e41e68e7e1ee0934da349d1a98df4064b65 100755
(executable)
--- a/
trusty/debian/rules
+++ b/
trusty/debian/rules
@@
-1,10
+1,8
@@
#!/usr/bin/make -f
#!/usr/bin/make -f
-#export DH_VERBOSE=1
-
+export HOME="$(CURDIR)/debian/test"
include /usr/share/openstack-pkg-tools/pkgos.make
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,systemd,sphinxdoc
%:
dh $@ --with python2,systemd,sphinxdoc
@@
-12,7
+10,6
@@
export OSLO_PACKAGE_VERSION=$(VERSION)
override_dh_clean:
dh_clean
rm -rf .testrepository
override_dh_clean:
dh_clean
rm -rf .testrepository
- rm -rf ceilometer.egg-info
rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
override_dh_install:
rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
override_dh_install:
@@
-39,9
+36,9
@@
override_dh_auto_build:
override_dh_auto_clean:
dh_auto_clean
override_dh_auto_clean:
dh_auto_clean
- rm -rf debian/*.upstart
- rm -rf debian/ceilometer-common.postinst
+ rm -rf .testrepository
find . -iname '*.pyc' -delete
find . -iname '*.pyc' -delete
+ rm -f debian/*.init debian/*.service debian/*.upstart
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
@@
-49,7
+46,7
@@
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
testr init
set -e ; \
TEMP_REZ=`mktemp -t` ; \
testr init
set -e ; \
TEMP_REZ=`mktemp -t` ; \
- bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!
.*test_bin.*
)' | tee $$TEMP_REZ | subunit2pyunit ; \
+ 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
cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
rm -f $$TEMP_REZ ;
testr slowest