From f966b3e5c6874fcb56d550945efc2f0465355c1c Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Fri, 21 Nov 2025 12:03:03 +0000
Subject: [PATCH] CI: Remove lingering stdout_callback=yaml in macOS jobs

Support removed in Ansible 13 (ansible-core 2.20).
refs #1285, #1291
---
 tests/image_prep/ansible.cfg | 3 ++-
 tox.ini                      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/image_prep/ansible.cfg b/tests/image_prep/ansible.cfg
index da778786..f698ed89 100644
--- a/tests/image_prep/ansible.cfg
+++ b/tests/image_prep/ansible.cfg
@@ -1,12 +1,13 @@
 
 [defaults]
+# Ansible >= 6 (ansible-core >= 2.13)
+callback_result_format = yaml
 deprecation_warnings = false
 strategy_plugins = ../../ansible_mitogen/plugins/strategy
 retry_files_enabled = false
 display_args_to_stdout = True
 no_target_syslog = True
 host_key_checking = False
-stdout_callback = yaml
 
 [inventory]
 unparsed_is_fatal = true
diff --git a/tox.ini b/tox.ini
index fba4ccf3..08b2eb98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -117,6 +117,7 @@ setenv =
     PIP_CONSTRAINT={toxinidir}/tests/constraints.txt
     # Superceded in Ansible >= 6 (ansible-core >= 2.13) by result_format=yaml
     # Deprecated in Ansible 12 (ansible-core 2.19)
+    # Removed in Ansible 13 (ansible-core 2.20)
     ans{2.10,3,4,5}: ANSIBLE_STDOUT_CALLBACK=yaml
     # Print warning on the first occurence at each module:linenno in Mitogen. Available Python 2.7, 3.2+.
     PYTHONWARNINGS=default:::ansible_mitogen,default:::mitogen