X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Frules;h=bfe2012556232bb57294e6fe034fd1560dc467bb;hb=refs%2Fchanges%2F03%2F903%2F2;hp=5c69355ab6b6ed59912b4668a060fc4b10c9abe9;hpb=41c661dde15aa2524a423ced2815671886af8f36;p=openstack-build%2Fneutron-build.git

diff --git a/debian/rules b/debian/rules
index 5c69355ab..bfe201255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,11 @@
 	dh $@  --with python2
 
 override_dh_install:
-	dh_install --fail-missing -X/usr/etc -X/usr/bin/quantum
+	dh_install --fail-missing -X/usr/etc
+
+override_dh_installinit:
+	dh_installinit
+	dh_installinit -pneutron-plugin-openvswitch-agent --no-start --name=neutron-ovs-cleanup
 
 override_dh_auto_clean:
 	dh_clean
@@ -17,5 +21,11 @@ get-orig-source:
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N -P --concurrency=1 || true
+	# 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