From 43e1dce8893871248a30c0d3d9c2b4fe880bb92b Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 9 Jul 2021 16:22:24 -0700 Subject: [PATCH] Preserve zuul executor SIGTERM behavior There is a change (the depends on) to modify how zuul executors handle SIGTERM. Update our executor config to preserve the old behavior of stopping the instance immediately rather than doing a graceful stop. If we need to we can still request graceful stops directly using the graceful stop command. Depends-On: https://review.opendev.org/c/zuul/zuul/+/804464/ Change-Id: I76a2646a13a71d190be265354de18468bc93184c --- playbooks/roles/zuul/templates/zuul.conf.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/playbooks/roles/zuul/templates/zuul.conf.j2 b/playbooks/roles/zuul/templates/zuul.conf.j2 index ca7079c713..e3fe5697d2 100644 --- a/playbooks/roles/zuul/templates/zuul.conf.j2 +++ b/playbooks/roles/zuul/templates/zuul.conf.j2 @@ -60,6 +60,7 @@ trusted_ro_paths=/etc/openafs:/etc/ssl/certs:/var/lib/zuul/ssh trusted_rw_paths=/afs untrusted_ro_paths=/etc/ssl/certs disk_limit_per_job=5000 +sigterm_method=stop [web] log_config=/etc/zuul/web-logging.conf