summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-09-09 08:52:15 +0000
committerGerrit Code Review <review@openstack.org>2022-09-09 08:52:15 +0000
commit2a675bdb71d5e7f3d426082698c61b310b2cf2e0 (patch)
tree2f8cbd526dbb61d944ec8970cce8e171f9f0d635
parent3d60914a0e2cbc6017abce7caa9a16cc1e49bcc3 (diff)
parent687f1c4749c8532279620dc62536fd118ce3b3a5 (diff)
downloadzuul-2a675bdb71d5e7f3d426082698c61b310b2cf2e0.tar.gz
Merge "Don't run cleanup playbooks after setup failure"
-rw-r--r--zuul/executor/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 1273cbaa4..89f93b8c5 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -1837,6 +1837,11 @@ class AnsibleJob(object):
if not self.jobdir.cleanup_playbooks:
return
+ if not self.frozen_hostvars:
+ # Job failed before we could load the frozen hostvars.
+ # This means we can't run any cleanup playbooks.
+ return
+
# TODO: make this configurable
cleanup_timeout = 300