summaryrefslogtreecommitdiff
path: root/zuul/ansible
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-09-07 20:57:07 +0000
committerGerrit Code Review <review@openstack.org>2022-09-07 20:57:07 +0000
commit1db67256419fce40a5934f5e388508ab74a386df (patch)
treec871c8fa11d0d3c357faf96dc550ac3f01805b2a /zuul/ansible
parentf5188c6914eb02856af354ad60da96fd21852dc2 (diff)
parent98296dd5f6e27993f8ccd85dc439d3a54f66a112 (diff)
downloadzuul-1db67256419fce40a5934f5e388508ab74a386df.tar.gz
Merge "zuul_stream: handle failed_when tasks"
Diffstat (limited to 'zuul/ansible')
-rw-r--r--zuul/ansible/base/callback/zuul_stream.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/zuul/ansible/base/callback/zuul_stream.py b/zuul/ansible/base/callback/zuul_stream.py
index 39d3aa953..03cc6a1f8 100644
--- a/zuul/ansible/base/callback/zuul_stream.py
+++ b/zuul/ansible/base/callback/zuul_stream.py
@@ -542,10 +542,18 @@ class CallbackModule(default.CallbackModule):
elif result_dict.get('msg') == 'All items completed':
self._log_message(result, result_dict['msg'])
else:
- self._log_message(
- result,
- "Runtime: {delta}".format(
- **result_dict))
+ if 'delta' in result_dict:
+ self._log_message(
+ result,
+ "Runtime: {delta}".format(
+ **result_dict))
+ else:
+ # NOTE(ianw) 2022-08-24 : *Fairly* sure that you only
+ # fall into here when the call actually fails (and has
+ # not start/end time), but it is ignored by
+ # failed_when matching.
+ self._log_message(result, msg='ERROR (ignored)',
+ result_dict=result_dict)
def v2_runner_item_on_ok(self, result):
result_dict = dict(result._result)