Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements/static/ci/linux.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
pyiface
pygit2>=1.10.1
pymysql>=1.1.1
ansible>=9.1.0; python_version >= '3.10'
ansible>=9.2.0; python_version >= '3.10'
twilio
python-telegram-bot>=13.7
yamllint
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ aiosignal==1.2.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# aiohttp
ansible-core==2.16.3
ansible-core==2.17.12
# via
# -c requirements/static/ci/py3.10/linux.txt
# ansible
ansible==9.1.0 ; python_version >= "3.10"
ansible==10.7.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/linux.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ aiohttp==3.12.13
# etcd3-py
aiosignal==1.2.0
# via aiohttp
ansible-core==2.16.3
ansible-core==2.17.12
# via ansible
ansible==9.1.0 ; python_version >= "3.10"
ansible==10.7.0 ; python_version >= "3.10"
# via -r requirements/static/ci/linux.in
apache-libcloud==2.5.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ aiosignal==1.2.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# aiohttp
ansible-core==2.16.3
ansible-core==2.18.6
# via
# -c requirements/static/ci/py3.11/linux.txt
# ansible
ansible==9.1.0 ; python_version >= "3.10"
ansible==11.7.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/linux.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ aiohttp==3.12.13
# etcd3-py
aiosignal==1.2.0
# via aiohttp
ansible-core==2.16.3
ansible-core==2.18.6
# via ansible
ansible==9.1.0 ; python_version >= "3.10"
ansible==11.7.0 ; python_version >= "3.10"
# via -r requirements/static/ci/linux.in
apache-libcloud==2.5.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.12/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ aiosignal==1.2.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
ansible-core==2.16.3
ansible-core==2.18.6
# via
# -c requirements/static/ci/py3.12/linux.txt
# ansible
ansible==9.1.0 ; python_version >= "3.10"
ansible==11.7.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/linux.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.12/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ aiohttp==3.12.13
# etcd3-py
aiosignal==1.2.0
# via aiohttp
ansible-core==2.16.3
ansible-core==2.18.6
# via ansible
ansible==9.1.0 ; python_version >= "3.10"
ansible==11.7.0 ; python_version >= "3.10"
# via -r requirements/static/ci/linux.in
apache-libcloud==2.5.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
Expand Down
42 changes: 36 additions & 6 deletions tests/pytests/integration/states/test_ansiblegate.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
def ansible_inventory_directory(tmp_path_factory, grains):
if grains["os_family"] != "RedHat" or grains["os"] == "VMware Photon OS":
pytest.skip("Currently, the test targets the RedHat OS familly only.")
if grains["os"] == "Rocky" and grains["osmajorrelease"] == 8:
pytest.skip("ansible-core doesn't support dnf on Rocky Linux 8")
tmp_dir = tmp_path_factory.mktemp("ansible")
try:
yield tmp_dir
Expand Down Expand Up @@ -73,12 +75,26 @@ def test_ansible_playbook(salt_call_cli, ansible_inventory, tmp_path):
---
- hosts: all
tasks:
- name: remove postfix
yum:
- name: remove postfix dnf
ansible.builtin.dnf:
name: postfix
state: absent
become: true
become_user: root
when: ansible_pkg_mgr == 'dnf'

- name: remove postfix yum
ansible.builtin.yum:
name: postfix
state: absent
become: true
when: ansible_pkg_mgr == 'yum'

- name: remove postfix apt
ansible.builtin.apt:
name: postfix
state: absent
become: true
when: ansible_pkg_mgr == 'apt'
"""
)
remove_playbook = rundir / "remove.yml"
Expand All @@ -88,12 +104,26 @@ def test_ansible_playbook(salt_call_cli, ansible_inventory, tmp_path):
---
- hosts: all
tasks:
- name: install postfix
yum:
- name: install postfix dnf
ansible.builtin.dnf:
name: postfix
state: present
become: true
when: ansible_pkg_mgr == 'dnf'

- name: install postfix yum
ansible.builtin.yum:
name: postfix
state: present
become: true
when: ansible_pkg_mgr == 'yum'

- name: install postfix apt
ansible.builtin.apt:
name: postfix
state: present
become: true
become_user: root
when: ansible_pkg_mgr == 'apt'
"""
)
install_playbook = rundir / "install.yml"
Expand Down