Add Neutron tests improvements

[openstack-build/neutron-build.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 9910de92dd884a550a44ac9c232b7e76d1f20d91..bfe2012556232bb57294e6fe034fd1560dc467bb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,15 +7,25 @@
        dh $@  --with python2
 
 override_dh_install:
-       dh_install --fail-missing -X/usr/etc -X/usr/bin
+       dh_install --fail-missing -X/usr/etc
 
-get-orig-source:
-       uscan --verbose --force-download --rename --destdir=../build-area
+override_dh_installinit:
+       dh_installinit
+       dh_installinit -pneutron-plugin-openvswitch-agent --no-start --name=neutron-ovs-cleanup
 
 override_dh_auto_clean:
        dh_clean
 
+get-orig-source:
+       uscan --verbose --force-download --rename --destdir=../build-area
+
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-       ./run_tests.sh -N -P
+       # Unpatch quantum configuration to fixup tests which conflict
+       # with a core_plugin being set.
+       patch -p1 -R < debian/patches/fix-neutron-configuration.patch
+       # Set a reasonable level of concurrency
+       ./run_tests.sh -N -P --concurrency=4
+       # Patch configuration file after testing
+       patch -p1 < debian/patches/fix-neutron-configuration.patch
 endif