X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Frules;h=60e37da0f60cffc12baf1efb7762d5b5708957d4;hb=refs%2Fheads%2Fopenstack-ci%2Fbuild%2Fhavana;hp=5c69355ab6b6ed59912b4668a060fc4b10c9abe9;hpb=b8c751c0e66c4006e2ab2068726acb8cfa62a030;p=openstack-build%2Fneutron-build.git

diff --git a/debian/rules b/debian/rules
index 5c69355ab..60e37da0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,5 +17,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-quantum-configuration.patch
+	# Set a reasonable level of concurrency
+	./run_tests.sh -N -P --concurrency=4 || true
+	# Patch configuration file after testing
+	patch -p1 < debian/patches/fix-quantum-configuration.patch
 endif