Merge "Fix lazy initialization of GithubUser with apps"
diff --git a/doc/source/admin/monitoring.rst b/doc/source/admin/monitoring.rst
index e6e6139..6dbdb31 100644
--- a/doc/source/admin/monitoring.rst
+++ b/doc/source/admin/monitoring.rst
@@ -26,7 +26,7 @@
These metrics are emitted by the Zuul :ref:`scheduler`:
-.. stat:: zuul.event.<driver>.event.<type>
+.. stat:: zuul.event.<driver>.<type>
:type: counter
Zuul will report counters for each type of event it receives from
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 03a3a12..e72fc13 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -1261,6 +1261,9 @@
config.write('internal_poll_interval = 0.01\n')
config.write('[ssh_connection]\n')
+ # NOTE(pabelanger): Try up to 3 times to run a task on a host, this
+ # helps to mitigate UNREACHABLE host errors with SSH.
+ config.write('retries = 3\n')
# NB: when setting pipelining = True, keep_remote_files
# must be False (the default). Otherwise it apparently
# will override the pipelining option and effectively