Add Neutron tests improvements
[openstack-build/neutron-build.git] / debian / rules
index 5c69355ab6b6ed59912b4668a060fc4b10c9abe9..bfe2012556232bb57294e6fe034fd1560dc467bb 100755 (executable)
@@ -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