Skip to content

Commit 89199ec

Browse files
committed
WIP
1 parent 8924470 commit 89199ec

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,30 +156,21 @@ jobs:
156156
"$PYTHON" -m tox -e "${{ matrix.tox_env }}"
157157
158158
macos:
159-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
160-
runs-on: macos-12
159+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
160+
runs-on: macos-13
161161
timeout-minutes: 120
162162

163163
strategy:
164164
fail-fast: false
165165
matrix:
166166
include:
167-
- name: Mito_27
168-
tox_env: py27-mode_mitogen
169167
- name: Mito_313
170-
python_version: '3.13'
171168
tox_env: py313-mode_mitogen
172169

173-
- name: Loc_27_210
174-
tox_env: py27-mode_localhost-ansible2.10
175170
- name: Loc_313_10
176-
python_version: '3.13'
177171
tox_env: py313-mode_localhost-ansible10
178172

179-
- name: Van_27_210
180-
tox_env: py27-mode_localhost-ansible2.10-strategy_linear
181173
- name: Van_313_10
182-
python_version: '3.13'
183174
tox_env: py313-mode_localhost-ansible10-strategy_linear
184175

185176
steps:

tests/ansible/regression/issue_655__wait_for_connection_error.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,16 @@
1111
tasks:
1212
- meta: end_play
1313
when:
14-
# TODO CI currently runs on macOS 12 & which isn't supported by Podman
15-
# version available in Homebrew.
14+
# Podman versions available in Homebrew have dropped macOS 12 support.
1615
- ansible_facts.system == 'Darwin'
1716
- ansible_facts.distribution_version is version('13.0', '<', strict=True)
1817

18+
- meta: end_play
19+
when:
20+
# Ansible 10 (ansible-core 2.17+) require Python 3.7+ on targets.
21+
# On CentOS 8 /usr/libexec/platform-python is Python 3.6
22+
- ansible_version.full is version('2.17', '>=', strict=True)
23+
1924
- name: set up test container and run tests inside it
2025
block:
2126
- name: install deps
@@ -33,6 +38,7 @@
3338
- cmd: podman info
3439
timeout: 300
3540
register: podman_machine
41+
changed_when: true
3642

3743
- debug:
3844
var: podman_machine
@@ -41,11 +47,13 @@
4147
- name: create container
4248
command:
4349
cmd: podman run --name testMitogen -d --rm centos:8 bash -c "sleep infinity & wait"
50+
changed_when: true
4451

4552
- name: add container to inventory
4653
add_host:
4754
name: testMitogen
4855
ansible_connection: podman
56+
ansible_python_interpreter: /usr/libexec/platform-python # Python 3.6
4957
ansible_user: root
5058
changed_when: false
5159
environment:
@@ -57,6 +65,7 @@
5765
- name: create test file
5866
file:
5967
path: /var/run/reboot-required
68+
mode: u=rw,go=r
6069
state: touch
6170

6271
- name: Check if reboot is required
@@ -68,13 +77,16 @@
6877
shell: sleep 2 && shutdown -r now "Ansible updates triggered"
6978
async: 1
7079
poll: 0
71-
when: reboot_required.stat.exists == True
80+
changed_when: true
81+
when:
82+
- reboot_required.stat.exists
7283

7384
- name: Wait 300 seconds for server to become available
7485
wait_for_connection:
7586
delay: 30
7687
timeout: 300
77-
when: reboot_required.stat.exists == True
88+
when:
89+
- reboot_required.stat.exists
7890

7991
- name: cleanup test file
8092
file:
@@ -90,6 +102,7 @@
90102
loop:
91103
- cmd: podman stop testMitogen
92104
- cmd: podman machine stop
105+
changed_when: true
93106
when:
94107
- ansible_facts.pkg_mgr in ['homebrew']
95108
tags:

0 commit comments

Comments
 (0)