ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-22 05:09:12 +00:00
Code Activity

Integration tests: replace ansible_xxx with ansible_facts.xxx (#11479)

Browse source 
Replace ansible_xxx with ansible_facts.xxx.
This commit is contained in:
Felix Fontein 2026-02-07 18:18:48 +01:00 • committed by GitHub
parent 106817316d
commit 476f2bf641
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
144 changed files with 548 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/integration/targets/supervisorctl/tasks/main.yml
View file

@ -10,9 +10,9 @@
- when:
# setuptools is too old on RHEL/CentOS 6 (https://github.com/Supervisor/meld3/issues/23)
- ansible_os_family != 'RedHat' or ansible_distribution_major_version|int > 6
- ansible_facts.os_family != 'RedHat' or ansible_facts.distribution_major_version|int > 6
# For some reason CentOS 7 and OpenSuSE 15 do not work on ansible-core 2.16
- ansible_version.minor != 16 or ansible_distribution not in ['CentOS', 'openSUSE Leap']
- ansible_version.minor != 16 or ansible_facts.distribution not in ['CentOS', 'openSUSE Leap']
block:
- block:
- tempfile:
@ -28,16 +28,16 @@
- include_vars: '{{ item }}'
with_first_found:
- files:
- '{{ ansible_distribution }}.yml'
- '{{ ansible_os_family }}.yml'
- '{{ ansible_facts.distribution }}.yml'
- '{{ ansible_facts.os_family }}.yml'
- 'defaults.yml'
- include_tasks: '{{ item }}'
with_first_found:
- files:
- 'install_{{ ansible_distribution }}.yml' # CentOS
- 'install_{{ ansible_os_family }}.yml' # RedHat
- 'install_{{ ansible_system }}.yml' # Linux
- 'install_{{ ansible_facts.distribution }}.yml' # CentOS
- 'install_{{ ansible_facts.os_family }}.yml' # RedHat
- 'install_{{ ansible_facts.system }}.yml' # Linux
- include_tasks: test.yml
with_items:
@ -50,9 +50,9 @@
- include_tasks: '{{ item }}'
with_first_found:
- files:
- 'uninstall_{{ ansible_distribution }}.yml' # CentOS
- 'uninstall_{{ ansible_os_family }}.yml' # RedHat
- 'uninstall_{{ ansible_system }}.yml' # Linux
- 'uninstall_{{ ansible_facts.distribution }}.yml' # CentOS
- 'uninstall_{{ ansible_facts.os_family }}.yml' # RedHat
- 'uninstall_{{ ansible_facts.system }}.yml' # Linux
- file:
path: '{{ supervisord_sock_path.path }}'

8
tests/integration/targets/supervisorctl/templates/supervisord.conf
View file

@ -9,16 +9,16 @@ pidfile={{ remote_dir }}/supervisord.pid
logfile={{ remote_dir }}/supervisord.log
[program:py1]
command={{ ansible_python.executable }} -i -u -
user={{ ansible_user_id }}
command={{ ansible_facts.python.executable }} -i -u -
user={{ ansible_facts.user_id }}
autostart=false
autorestart=false
stdout_logfile={{ remote_dir }}/py1.log
redirect_stderr=yes
[program:py2]
command={{ ansible_python.executable }} -i -u -
user={{ ansible_user_id }}
command={{ ansible_facts.python.executable }} -i -u -
user={{ ansible_facts.user_id }}
autostart=false
autorestart=false
stdout_logfile={{ remote_dir }}/py2.log