Skip to content

Commit 8a31a04

Browse files
committed
Various dev fixes
1 parent ee2f8ba commit 8a31a04

File tree

4 files changed

+60
-5
lines changed

4 files changed

+60
-5
lines changed

.github/workflows/molecule.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ jobs:
3838
- uses: gofrolist/molecule-action@v2
3939
env:
4040
ANSIBLE_FORCE_COLOR: '1'
41-
ANSIBLE_STDOUT_CALLBACK: ${{ runner.debug == '1' && 'debug' || 'yaml' }}
41+
ANSIBLE_STDOUT_CALLBACK: ${{ runner.debug == '1' && 'debug' || 'ansible.builtin.default' }}
42+
ANSIBLE_CALLBACK_RESULT_FORMAT: yaml
4243
MOLECULE_REPORT: molecule-${{ matrix.scenario }}-report.html
4344
MT_RUNNER_MT4_PASSWORD: ${{ secrets.MT_RUNNER_MT4_PASSWORD || 'SETME' }}
4445
MT_RUNNER_MT5_LOGIN: ${{ secrets.MT_RUNNER_MT5_LOGIN || '12345' }}
4546
MT_RUNNER_MT5_PASSWORD: ${{ secrets.MT_RUNNER_MT5_PASSWORD || 'SETME' }}
4647
with:
47-
molecule_args: --scenario-name ${{ matrix.scenario }}
48+
molecule_args: >-
49+
--scenario-name ${{ matrix.scenario }}
4850
molecule_command: test
4951
molecule_options: ${{ runner.debug == '1' && '--verbose' || '' }}
5052
molecule_working_dir: ${{ github.repository }}

molecule/default/molecule.yml

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
---
2+
# Molecule configuration file.
3+
# Dependency management (download roles/collections)
4+
# Note: Keep YAML keys sorted alphabetically.
5+
dependency:
6+
name: galaxy
7+
options:
8+
ignore-certs: false
9+
ignore-errors: false
10+
role-file: requirements.yml
11+
requirements-file: requirements.yml
212
driver:
313
name: docker
414
lint: |
515
set -e
616
yamllint .
17+
molecule syntax
718
ansible-lint
819
platforms:
920
- env:
@@ -16,15 +27,48 @@ platforms:
1627
provisioner:
1728
config_options:
1829
defaults:
30+
host_key_checking: false
1931
# Use the built-in default callback with result_format instead of community.general.yaml
2032
stdout_callback: ansible.builtin.default
2133
result_format: yaml
2234
remote_tmp: /tmp/.ansible-tmp-$${USER}
23-
name: ansible
2435
inventory:
2536
group_vars:
2637
all:
2738
wine_install_winetricks: true
2839
wine_release: stable
40+
host_vars:
41+
nixos-latest:
42+
ansible_python_interpreter: /root/.nix-profile/bin/python3
43+
ssh_connection:
44+
pipelining: true
45+
name: ansible
46+
options:
47+
diff: true
48+
force-handlers: true
49+
playbooks:
50+
cleanup: cleanup.yml
51+
converge: converge.yml
52+
create: create.yml
53+
destroy: destroy.yml
54+
prepare: prepare.yml
55+
side_effect: side_effect.yml
56+
verify: verify.yml
57+
58+
scenario:
59+
name: default
60+
test_sequence:
61+
- dependency
62+
- cleanup
63+
- destroy
64+
- syntax
65+
- create
66+
- prepare
67+
- converge
68+
- idempotence
69+
- side_effect
70+
- verify
71+
- cleanup
72+
- destroy
2973
verifier:
3074
name: ansible

tests/inventory/docker-containers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ all:
2525
ansible_python_interpreter: /usr/bin/python3
2626
mt-runner-on-nixos-latest:
2727
ansible_connection: docker
28-
ansible_host: mt-runner-on-nixos-latest
29-
ansible_python_interpreter: /nix/var/nix/profiles/default/bin/python3
28+
ansible_host: template-on-nixos-latest
29+
ansible_python_interpreter: /root/.nix-profile/bin/python3

tests/playbooks/docker-containers.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
state: started
2020
command: sleep infinity
2121
delegate_to: localhost
22+
vars:
23+
# Use system Python with requests installed for controller-side Docker modules.
24+
ansible_python_interpreter: "{{ controller_python }}"
2225

2326
- name: Wait for container to be ready
2427
community.docker.docker_container_info:
@@ -31,6 +34,9 @@
3134
delay: 2
3235
delegate_to: localhost
3336
retries: 10
37+
vars:
38+
# Use system Python with requests installed for controller-side Docker modules.
39+
ansible_python_interpreter: "{{ controller_python }}"
3440

3541
- name: Install Python 3 on Alpine
3642
ansible.builtin.raw: |
@@ -65,6 +71,7 @@
6571

6672
tags: always
6773
vars:
74+
controller_python: "{{ ansible_playbook_python }}"
6875
container_image_map:
6976
mt-runner-on-alpine-latest: alpine:latest
7077
mt-runner-on-debian-latest: debian:latest
@@ -80,6 +87,8 @@
8087
hosts: docker_containers
8188
gather_facts: true
8289
tags: always
90+
vars:
91+
controller_python: "{{ ansible_playbook_python }}"
8392
tasks:
8493
- name: Installs ea31337.mt_runner role
8594
ansible.builtin.import_role:

0 commit comments

Comments
 (0)