From 06df62c8b87cb829e00e8bcc15de6c03bc79e8b3 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Mon, 4 Nov 2024 16:13:56 +0000
Subject: [PATCH] CI: Migrated macOS 12 runners to macOS 13, due to EOL.

macOS Python 2.7 jobs have been removed because the macOS 13 image doesn't
include CPython 2.7.
---
 .github/workflows/tests.yml                   | 13 ++----------
 docs/changelog.rst                            |  1 +
 .../issue_655__wait_for_connection_error.yml  | 21 +++++++++++++++----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cc20f04a..15dda039 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -156,30 +156,21 @@ jobs:
           "$PYTHON" -m tox -e "${{ matrix.tox_env }}"
 
   macos:
-    # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
-    runs-on: macos-12
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+    runs-on: macos-13
     timeout-minutes: 120
 
     strategy:
       fail-fast: false
       matrix:
         include:
-          - name: Mito_27
-            tox_env: py27-mode_mitogen
           - name: Mito_313
-            python_version: '3.13'
             tox_env: py313-mode_mitogen
 
-          - name: Loc_27_210
-            tox_env: py27-mode_localhost-ansible2.10
           - name: Loc_313_10
-            python_version: '3.13'
             tox_env: py313-mode_localhost-ansible10
 
-          - name: Van_27_210
-            tox_env: py27-mode_localhost-ansible2.10-strategy_linear
           - name: Van_313_10
-            python_version: '3.13'
             tox_env: py313-mode_localhost-ansible10-strategy_linear
 
     steps:
diff --git a/docs/changelog.rst b/docs/changelog.rst
index dd4d708d..b6930331 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -29,6 +29,7 @@ In progress (unreleased)
   (``ansible_ssh_executable``).
 * :gh:issue:`1083` :mod:`ansible_mitogen`: Fixed templated connection options
   during a ``meta: reset_connection`` task.
+* :gh:issue:`1129` CI: Migrated macOS 12 runners to macOS 13, due to EOL.
 
 
 v0.3.15 (2024-10-28)
diff --git a/tests/ansible/regression/issue_655__wait_for_connection_error.yml b/tests/ansible/regression/issue_655__wait_for_connection_error.yml
index 4972d91a..a1f39f66 100644
--- a/tests/ansible/regression/issue_655__wait_for_connection_error.yml
+++ b/tests/ansible/regression/issue_655__wait_for_connection_error.yml
@@ -11,11 +11,16 @@
   tasks:
     - meta: end_play
       when:
-        # TODO CI currently runs on macOS 12 & which isn't supported by Podman
-        #      version available in Homebrew.
+        # Podman versions available in Homebrew have dropped macOS 12 support.
         - ansible_facts.system == 'Darwin'
         - ansible_facts.distribution_version is version('13.0', '<', strict=True)
 
+    - meta: end_play
+      when:
+        # Ansible 10 (ansible-core 2.17+) require Python 3.7+ on targets.
+        # On CentOS 8 /usr/libexec/platform-python is Python 3.6
+        - ansible_version.full is version('2.17', '>=', strict=True)
+
     - name: set up test container and run tests inside it
       block:
         - name: install deps
@@ -33,6 +38,7 @@
             - cmd: podman info
           timeout: 300
           register: podman_machine
+          changed_when: true
 
         - debug:
             var: podman_machine
@@ -41,11 +47,13 @@
         - name: create container
           command:
             cmd: podman run --name testMitogen -d --rm centos:8 bash -c "sleep infinity & wait"
+          changed_when: true
 
         - name: add container to inventory
           add_host:
             name: testMitogen
             ansible_connection: podman
+            ansible_python_interpreter: /usr/libexec/platform-python  # Python 3.6
             ansible_user: root
           changed_when: false
           environment:
@@ -57,6 +65,7 @@
             - name: create test file
               file:
                 path: /var/run/reboot-required
+                mode: u=rw,go=r
                 state: touch
 
             - name: Check if reboot is required
@@ -68,13 +77,16 @@
               shell: sleep 2 && shutdown -r now "Ansible updates triggered"
               async: 1
               poll: 0
-              when: reboot_required.stat.exists == True
+              changed_when: true
+              when:
+                - reboot_required.stat.exists
 
             - name: Wait 300 seconds for server to become available
               wait_for_connection:
                 delay: 30
                 timeout: 300
-              when: reboot_required.stat.exists == True
+              when:
+                - reboot_required.stat.exists
 
             - name: cleanup test file
               file:
@@ -90,6 +102,7 @@
           loop:
             - cmd: podman stop testMitogen
             - cmd: podman machine stop
+          changed_when: true
       when:
         - ansible_facts.pkg_mgr in ['homebrew']
   tags: