mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-05 01:43:05 +00:00
[PR #11479/476f2bf6 backport][stable-12] Integration tests: replace ansible_xxx with ansible_facts.xxx (#11480)
Integration tests: replace ansible_xxx with ansible_facts.xxx (#11479)
Replace ansible_xxx with ansible_facts.xxx.
(cherry picked from commit 476f2bf641)
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
de6967d3ff
commit
7fce59fbc6
144 changed files with 548 additions and 578 deletions
|
|
@ -60,5 +60,5 @@
|
|||
pkill -f -- '{{ remote_tmp_dir }}/serve.py'
|
||||
|
||||
when: |
|
||||
ansible_distribution == 'Fedora' or
|
||||
ansible_distribution == 'Ubuntu' and not ansible_distribution_major_version | int < 16
|
||||
ansible_facts.distribution == 'Fedora' or
|
||||
ansible_facts.distribution == 'Ubuntu' and not ansible_facts.distribution_major_version | int < 16
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
name: flatpak
|
||||
state: present
|
||||
become: true
|
||||
when: ansible_distribution == 'Fedora'
|
||||
when: ansible_facts.distribution == 'Fedora'
|
||||
|
||||
- block:
|
||||
- name: Activate flatpak ppa on Ubuntu
|
||||
|
|
@ -16,14 +16,14 @@
|
|||
repo: ppa:alexlarsson/flatpak
|
||||
state: present
|
||||
mode: '0644'
|
||||
when: ansible_lsb.major_release | int < 18
|
||||
when: ansible_facts.lsb.major_release | int < 18
|
||||
|
||||
- name: Install flatpak package on Ubuntu
|
||||
apt:
|
||||
name: flatpak
|
||||
state: present
|
||||
|
||||
when: ansible_distribution == 'Ubuntu'
|
||||
when: ansible_facts.distribution == 'Ubuntu'
|
||||
|
||||
- name: Install dummy remote for user
|
||||
flatpak_remote:
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
mode: '0755'
|
||||
|
||||
- name: Start HTTP server
|
||||
command: '{{ ansible_python.executable }} {{ remote_tmp_dir }}/serve.py 127.0.0.1 8000 /tmp/flatpak/'
|
||||
command: '{{ ansible_facts.python.executable }} {{ remote_tmp_dir }}/serve.py 127.0.0.1 8000 /tmp/flatpak/'
|
||||
async: 120
|
||||
poll: 0
|
||||
register: webserver_status
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue