Merge lp:~gandelman-a/ubuntu/saucy/neutron/limit_testr_concurrency into lp:~ubuntu-server-dev/neutron/havana

[Adam Gandelman]

The neutron test suite absolutely kills our build system when run with maximum concurrency. Limit it testr to run on only a single CPU. I propose we do this across most projects as our Jenkins has been noticeably bogged down since upstream migrated to testr.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-31 17:15:39 +0000
+++ debian/changelog	2013-08-01 05:31:32 +0000
@@ -1,9 +1,13 @@
 neutron (1:2013.2.a123.ga0bf351-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Chuck Short ]
   * New upstream release.
   * debian/patches/fix-quantum-configuration.patch: Refreshed.
   * debian/patches/neutron-conf.patch: Dropped.
 
+  [ Adam Gandelman ]
+  * debian/rules: Limit testr concurrency to 1 CPU.
+
  -- Chuck Short <[e-mail]>  Wed, 31 Jul 2013 16:55:55 +0000
 
 neutron (1:2013.2~b2-0ubuntu3) saucy; urgency=low

=== modified file 'debian/rules'
--- debian/rules	2013-07-16 22:31:35 +0000
+++ debian/rules	2013-08-01 05:31:32 +0000
@@ -17,5 +17,5 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N -P
+	./run_tests.sh -N -P --concurrency=1
 endif