Increase load_multiplier in tests

We're seeing many test failures due to executors unregistering during
high system load and thus causing timeouts in test cases. During tests
we expect the system to be busy so increase the load_multiplier in
tests.

Change-Id: I54a05adc9e7cb9efaf20b70e59a59cefd44e21e9

37 files changed, 71 insertions, 25 deletions

diff --git a/tests/fixtures/zuul-admin-web-no-override.conf b/tests/fixtures/zuul-admin-web-no-override.conf
index e0f878144..996a8ee5c 100644
--- a/tests/fixtures/zuul-admin-web-no-override.conf
+++ b/tests/fixtures/zuul-admin-web-no-override.conf
@@ -12,6 +12,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -32,4 +33,3 @@ secret=NoDanaOnlyZuul
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-admin-web-oidc.conf b/tests/fixtures/zuul-admin-web-oidc.conf
index 55f817755..8c5c3daf2 100644
--- a/tests/fixtures/zuul-admin-web-oidc.conf
+++ b/tests/fixtures/zuul-admin-web-oidc.conf
@@ -12,6 +12,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -46,4 +47,3 @@ scope=openid profile email special-scope
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-admin-web-token-expiry.conf b/tests/fixtures/zuul-admin-web-token-expiry.conf
index 0292d833c..e42288e2f 100644
--- a/tests/fixtures/zuul-admin-web-token-expiry.conf
+++ b/tests/fixtures/zuul-admin-web-token-expiry.conf
@@ -12,6 +12,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -33,4 +34,3 @@ max_validity_time=5
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-admin-web.conf b/tests/fixtures/zuul-admin-web.conf
index 3933421f5..9d3b06778 100644
--- a/tests/fixtures/zuul-admin-web.conf
+++ b/tests/fixtures/zuul-admin-web.conf
@@ -12,6 +12,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -32,4 +33,3 @@ secret=NoDanaOnlyZuul
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-connections-cgit.conf b/tests/fixtures/zuul-connections-cgit.conf
index 3a09d2d74..e1d6267ee 100644
--- a/tests/fixtures/zuul-connections-cgit.conf
+++ b/tests/fixtures/zuul-connections-cgit.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -28,4 +29,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-connections-gerrit-and-github.conf b/tests/fixtures/zuul-connections-gerrit-and-github.conf
index 0d10b5abb..f27cb37a9 100644
--- a/tests/fixtures/zuul-connections-gerrit-and-github.conf
+++ b/tests/fixtures/zuul-connections-gerrit-and-github.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -32,4 +33,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-connections-gitweb.conf b/tests/fixtures/zuul-connections-gitweb.conf
index f0c0e8e44..a83302695 100644
--- a/tests/fixtures/zuul-connections-gitweb.conf
+++ b/tests/fixtures/zuul-connections-gitweb.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -27,4 +28,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-connections-merger.conf b/tests/fixtures/zuul-connections-merger.conf
index 7b21c2b68..fe9dd192c 100644
--- a/tests/fixtures/zuul-connections-merger.conf
+++ b/tests/fixtures/zuul-connections-merger.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection github]
 driver=github
diff --git a/tests/fixtures/zuul-connections-multiple-gerrits.conf b/tests/fixtures/zuul-connections-multiple-gerrits.conf
index bf869a590..baeef7364 100644
--- a/tests/fixtures/zuul-connections-multiple-gerrits.conf
+++ b/tests/fixtures/zuul-connections-multiple-gerrits.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection review_gerrit]
 driver=gerrit
@@ -33,4 +34,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-connections-same-gerrit.conf b/tests/fixtures/zuul-connections-same-gerrit.conf
index 937cd50b8..3cba7d788 100644
--- a/tests/fixtures/zuul-connections-same-gerrit.conf
+++ b/tests/fixtures/zuul-connections-same-gerrit.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection review_gerrit]
 driver=gerrit
@@ -33,4 +34,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-crd-pagure.conf b/tests/fixtures/zuul-crd-pagure.conf
index 4ddb49bef..378e1203f 100644
--- a/tests/fixtures/zuul-crd-pagure.conf
+++ b/tests/fixtures/zuul-crd-pagure.conf
@@ -16,6 +16,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -40,4 +41,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-default-ansible-version.conf b/tests/fixtures/zuul-default-ansible-version.conf
index b22d2d2d9..36041ad79 100644
--- a/tests/fixtures/zuul-default-ansible-version.conf
+++ b/tests/fixtures/zuul-default-ansible-version.conf
@@ -18,6 +18,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -37,4 +38,3 @@ static_cache_expiry=1200
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-disk-accounting.conf b/tests/fixtures/zuul-disk-accounting.conf
index 564f0f1c4..539631d25 100644
--- a/tests/fixtures/zuul-disk-accounting.conf
+++ b/tests/fixtures/zuul-disk-accounting.conf
@@ -12,6 +12,7 @@ git_user_name=zuul
 [executor]
 git_dir=/tmp/zuul-test/executor-git
 disk_limit_per_job=1
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -28,4 +29,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-elastic-driver.conf b/tests/fixtures/zuul-elastic-driver.conf
index 5d4443cca..cd5b45a4f 100644
--- a/tests/fixtures/zuul-elastic-driver.conf
+++ b/tests/fixtures/zuul-elastic-driver.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/fixtures/zuul-executor-ansible-callback.conf b/tests/fixtures/zuul-executor-ansible-callback.conf
index f9f315463..1a8473ca9 100644
--- a/tests/fixtures/zuul-executor-ansible-callback.conf
+++ b/tests/fixtures/zuul-executor-ansible-callback.conf
@@ -33,6 +33,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -49,4 +50,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-executor-governor.conf b/tests/fixtures/zuul-executor-governor.conf
new file mode 100644
index 000000000..d8858e4ab
--- /dev/null
+++ b/tests/fixtures/zuul-executor-governor.conf
@@ -0,0 +1,35 @@
+[gearman]
+server=127.0.0.1
+
+[statsd]
+# note, use 127.0.0.1 rather than localhost to avoid getting ipv6
+# see: https://github.com/jsocol/pystatsd/issues/61
+server=127.0.0.1
+
+[scheduler]
+tenant_config=main.yaml
+
+[merger]
+git_dir=/tmp/zuul-test/merger-git
+git_user_email=zuul@example.com
+git_user_name=zuul
+
+[executor]
+git_dir=/tmp/zuul-test/executor-git
+hostname=test-executor-hostname.example.com
+
+[connection gerrit]
+driver=gerrit
+server=review.example.com
+user=jenkins
+sshkey=fake_id_rsa_path
+
+[connection smtp]
+driver=smtp
+server=localhost
+port=25
+default_from=zuul@example.com
+default_to=you@example.com
+
+[database]
+dburi=$MYSQL_FIXTURE_DBURI$
diff --git a/tests/fixtures/zuul-executor-hostname.conf b/tests/fixtures/zuul-executor-hostname.conf
index ea491dae2..4c0fdecd9 100644
--- a/tests/fixtures/zuul-executor-hostname.conf
+++ b/tests/fixtures/zuul-executor-hostname.conf
@@ -17,6 +17,7 @@ git_user_name=zuul
 [executor]
 git_dir=/tmp/zuul-test/executor-git
 hostname=test-executor-hostname.example.com
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -33,4 +34,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-gerrit-github.conf b/tests/fixtures/zuul-gerrit-github.conf
index 5fcada6a6..dc2e8060b 100644
--- a/tests/fixtures/zuul-gerrit-github.conf
+++ b/tests/fixtures/zuul-gerrit-github.conf
@@ -16,6 +16,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -36,4 +37,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-gerrit-no-stream.conf b/tests/fixtures/zuul-gerrit-no-stream.conf
index ac8b5a549..7cf1c490d 100644
--- a/tests/fixtures/zuul-gerrit-no-stream.conf
+++ b/tests/fixtures/zuul-gerrit-no-stream.conf
@@ -16,6 +16,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -34,4 +35,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-gerrit-web.conf b/tests/fixtures/zuul-gerrit-web.conf
index 7b4b3af82..cb04d3c2f 100644
--- a/tests/fixtures/zuul-gerrit-web.conf
+++ b/tests/fixtures/zuul-gerrit-web.conf
@@ -19,6 +19,7 @@ root=http://zuul.example.com
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -36,4 +37,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-git-driver.conf b/tests/fixtures/zuul-git-driver.conf
index 990a1db8e..86e36e029 100644
--- a/tests/fixtures/zuul-git-driver.conf
+++ b/tests/fixtures/zuul-git-driver.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -32,4 +33,3 @@ default_to=you@example.com
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-github-driver-enterprise.conf b/tests/fixtures/zuul-github-driver-enterprise.conf
index 4b9a9a2db..05b04bd1a 100644
--- a/tests/fixtures/zuul-github-driver-enterprise.conf
+++ b/tests/fixtures/zuul-github-driver-enterprise.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection github]
 driver=github
@@ -21,4 +22,3 @@ server=github.enterprise.io
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-github-driver.conf b/tests/fixtures/zuul-github-driver.conf
index f2e6fdd60..088ca0427 100644
--- a/tests/fixtures/zuul-github-driver.conf
+++ b/tests/fixtures/zuul-github-driver.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection github]
 driver=github
@@ -29,4 +30,3 @@ server=github.enterprise.io
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-gitlab-driver.conf b/tests/fixtures/zuul-gitlab-driver.conf
index d1ab4f8b8..400a73d9c 100644
--- a/tests/fixtures/zuul-gitlab-driver.conf
+++ b/tests/fixtures/zuul-gitlab-driver.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gitlab]
 driver=gitlab
diff --git a/tests/fixtures/zuul-hold-expiration.conf b/tests/fixtures/zuul-hold-expiration.conf
index eac5838b2..795254901 100644
--- a/tests/fixtures/zuul-hold-expiration.conf
+++ b/tests/fixtures/zuul-hold-expiration.conf
@@ -19,6 +19,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
@@ -39,4 +40,3 @@ root=https://zuul.example.com/
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-mqtt-driver.conf b/tests/fixtures/zuul-mqtt-driver.conf
index 500beca95..fa46155b5 100644
--- a/tests/fixtures/zuul-mqtt-driver.conf
+++ b/tests/fixtures/zuul-mqtt-driver.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/fixtures/zuul-multi-github.conf b/tests/fixtures/zuul-multi-github.conf
index f1090254e..abac8c888 100644
--- a/tests/fixtures/zuul-multi-github.conf
+++ b/tests/fixtures/zuul-multi-github.conf
@@ -14,6 +14,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection github]
 driver=github
diff --git a/tests/fixtures/zuul-pagure-driver-whitelist.conf b/tests/fixtures/zuul-pagure-driver-whitelist.conf
index 79a91434e..209909e0e 100644
--- a/tests/fixtures/zuul-pagure-driver-whitelist.conf
+++ b/tests/fixtures/zuul-pagure-driver-whitelist.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection pagure]
 driver=pagure
@@ -20,4 +21,3 @@ source_whitelist=::ffff:127.0.0.1
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-pagure-driver.conf b/tests/fixtures/zuul-pagure-driver.conf
index c2f2ebe93..6d7ae6f68 100644
--- a/tests/fixtures/zuul-pagure-driver.conf
+++ b/tests/fixtures/zuul-pagure-driver.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection pagure]
 driver=pagure
@@ -19,4 +20,3 @@ api_token=0000000000000000000000000000000000000000
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-push-reqs.conf b/tests/fixtures/zuul-push-reqs.conf
index ed71497b0..92ba94861 100644
--- a/tests/fixtures/zuul-push-reqs.conf
+++ b/tests/fixtures/zuul-push-reqs.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection github]
 driver=github
@@ -23,4 +24,3 @@ user=jenkins
 
 [database]
 dburi=$MYSQL_FIXTURE_DBURI$
-
diff --git a/tests/fixtures/zuul-sql-driver-mysql.conf b/tests/fixtures/zuul-sql-driver-mysql.conf
index 1a491ef55..f972130bc 100644
--- a/tests/fixtures/zuul-sql-driver-mysql.conf
+++ b/tests/fixtures/zuul-sql-driver-mysql.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/fixtures/zuul-sql-driver-postgres.conf b/tests/fixtures/zuul-sql-driver-postgres.conf
index 4ecfa27e6..7a9c3a2b4 100644
--- a/tests/fixtures/zuul-sql-driver-postgres.conf
+++ b/tests/fixtures/zuul-sql-driver-postgres.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/fixtures/zuul-sql-driver-prefix-mysql.conf b/tests/fixtures/zuul-sql-driver-prefix-mysql.conf
index 35b0e7921..3f9e91388 100644
--- a/tests/fixtures/zuul-sql-driver-prefix-mysql.conf
+++ b/tests/fixtures/zuul-sql-driver-prefix-mysql.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/fixtures/zuul-sql-driver-prefix-postgres.conf b/tests/fixtures/zuul-sql-driver-prefix-postgres.conf
index 88b7da457..4ac15ea35 100644
--- a/tests/fixtures/zuul-sql-driver-prefix-postgres.conf
+++ b/tests/fixtures/zuul-sql-driver-prefix-postgres.conf
@@ -11,6 +11,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/fixtures/zuul-winrm.conf b/tests/fixtures/zuul-winrm.conf
index d06cf9a63..9d55a7e7b 100644
--- a/tests/fixtures/zuul-winrm.conf
+++ b/tests/fixtures/zuul-winrm.conf
@@ -18,6 +18,7 @@ git_user_name=zuul
 git_dir=/tmp/zuul-test/executor-git
 winrm_operation_timeout_sec=120
 winrm_read_timeout_sec=180
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/fixtures/zuul.conf b/tests/fixtures/zuul.conf
index 49eea1b9c..bcf26db86 100644
--- a/tests/fixtures/zuul.conf
+++ b/tests/fixtures/zuul.conf
@@ -17,6 +17,7 @@ git_user_name=zuul
 
 [executor]
 git_dir=/tmp/zuul-test/executor-git
+load_multiplier=100
 
 [connection gerrit]
 driver=gerrit
diff --git a/tests/unit/test_executor.py b/tests/unit/test_executor.py
index a6f490275..be7b98e2c 100644
--- a/tests/unit/test_executor.py
+++ b/tests/unit/test_executor.py
@@ -612,7 +612,7 @@ class TestStartingBuildsSensor(ZuulTestCase):
 
 
 class TestGovernor(ZuulTestCase):
-    config_file = 'zuul-executor-hostname.conf'
+    config_file = 'zuul-executor-governor.conf'
     tenant_config_file = 'config/governor/main.yaml'
 
     @mock.patch('os.getloadavg')