Skip to content

Commit 55d4775

Browse files
committed
WIP
1 parent 8924470 commit 55d4775

File tree

2 files changed

+13
-63
lines changed

2 files changed

+13
-63
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,6 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
include:
27-
- name: Ans_27_210
28-
tox_env: py27-mode_ansible-ansible2.10
29-
- name: Ans_27_4
30-
tox_env: py27-mode_ansible-ansible4
31-
32-
- name: Ans_36_210
33-
python_version: '3.6'
34-
tox_env: py36-mode_ansible-ansible2.10
35-
- name: Ans_36_4
36-
python_version: '3.6'
37-
tox_env: py36-mode_ansible-ansible4
38-
39-
- name: Ans_311_210
40-
python_version: '3.11'
41-
tox_env: py311-mode_ansible-ansible2.10
42-
- name: Ans_311_3
43-
python_version: '3.11'
44-
tox_env: py311-mode_ansible-ansible3
45-
- name: Ans_311_4
46-
python_version: '3.11'
47-
tox_env: py311-mode_ansible-ansible4
48-
- name: Ans_311_5
49-
python_version: '3.11'
50-
tox_env: py311-mode_ansible-ansible5
51-
- name: Ans_313_6
52-
python_version: '3.13'
53-
tox_env: py313-mode_ansible-ansible6
54-
- name: Ans_313_7
55-
python_version: '3.13'
56-
tox_env: py313-mode_ansible-ansible7
57-
- name: Ans_313_8
58-
python_version: '3.13'
59-
tox_env: py313-mode_ansible-ansible8
60-
- name: Ans_313_9
61-
python_version: '3.13'
62-
tox_env: py313-mode_ansible-ansible9
63-
- name: Ans_313_10
64-
python_version: '3.13'
65-
tox_env: py313-mode_ansible-ansible10
66-
- name: Van_313_10
67-
python_version: '3.13'
68-
tox_env: py313-mode_ansible-ansible10-strategy_linear
69-
70-
- name: Mito_27
71-
tox_env: py27-mode_mitogen
72-
- name: Mito_36
73-
python_version: '3.6'
74-
tox_env: py36-mode_mitogen
7527
- name: Mito_313
7628
python_version: '3.13'
7729
tox_env: py313-mode_mitogen
@@ -156,30 +108,21 @@ jobs:
156108
"$PYTHON" -m tox -e "${{ matrix.tox_env }}"
157109
158110
macos:
159-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
160-
runs-on: macos-12
111+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
112+
runs-on: macos-13
161113
timeout-minutes: 120
162114

163115
strategy:
164116
fail-fast: false
165117
matrix:
166118
include:
167-
- name: Mito_27
168-
tox_env: py27-mode_mitogen
169119
- name: Mito_313
170-
python_version: '3.13'
171120
tox_env: py313-mode_mitogen
172121

173-
- name: Loc_27_210
174-
tox_env: py27-mode_localhost-ansible2.10
175122
- name: Loc_313_10
176-
python_version: '3.13'
177123
tox_env: py313-mode_localhost-ansible10
178124

179-
- name: Van_27_210
180-
tox_env: py27-mode_localhost-ansible2.10-strategy_linear
181125
- name: Van_313_10
182-
python_version: '3.13'
183126
tox_env: py313-mode_localhost-ansible10-strategy_linear
184127

185128
steps:

tests/ansible/regression/issue_655__wait_for_connection_error.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
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

@@ -33,6 +32,7 @@
3332
- cmd: podman info
3433
timeout: 300
3534
register: podman_machine
35+
changed_when: true
3636

3737
- debug:
3838
var: podman_machine
@@ -41,11 +41,13 @@
4141
- name: create container
4242
command:
4343
cmd: podman run --name testMitogen -d --rm centos:8 bash -c "sleep infinity & wait"
44+
changed_when: true
4445

4546
- name: add container to inventory
4647
add_host:
4748
name: testMitogen
4849
ansible_connection: podman
50+
ansible_python_interpreter: /usr/libexec/platform-python # Python 3.6
4951
ansible_user: root
5052
changed_when: false
5153
environment:
@@ -57,6 +59,7 @@
5759
- name: create test file
5860
file:
5961
path: /var/run/reboot-required
62+
mode: u=rw,go=r
6063
state: touch
6164

6265
- name: Check if reboot is required
@@ -68,13 +71,16 @@
6871
shell: sleep 2 && shutdown -r now "Ansible updates triggered"
6972
async: 1
7073
poll: 0
71-
when: reboot_required.stat.exists == True
74+
changed_when: true
75+
when:
76+
- reboot_required.stat.exists
7277

7378
- name: Wait 300 seconds for server to become available
7479
wait_for_connection:
7580
delay: 30
7681
timeout: 300
77-
when: reboot_required.stat.exists == True
82+
when:
83+
- reboot_required.stat.exists
7884

7985
- name: cleanup test file
8086
file:
@@ -90,6 +96,7 @@
9096
loop:
9197
- cmd: podman stop testMitogen
9298
- cmd: podman machine stop
99+
changed_when: true
93100
when:
94101
- ansible_facts.pkg_mgr in ['homebrew']
95102
tags:

0 commit comments

Comments
 (0)