From 4106ec65f9844eaf30fc9f855a4e8fd8c2bfd5df Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 21 May 2023 13:17:13 +0200 Subject: [PATCH] Replace 'include:' with 'include_tasks:'. 'include:' is removed for ansible-core 2.16. --- changelogs/fragments/466-tests.yml | 2 ++ tests/integration/targets/acl/tasks/main.yml | 2 +- tests/integration/targets/seboolean/tasks/main.yml | 2 +- tests/integration/targets/selinux/tasks/main.yml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/466-tests.yml diff --git a/changelogs/fragments/466-tests.yml b/changelogs/fragments/466-tests.yml new file mode 100644 index 0000000..3c08961 --- /dev/null +++ b/changelogs/fragments/466-tests.yml @@ -0,0 +1,2 @@ +trivial: + - "Fix integration tests so they work with ansible-core devel / 2.16 (https://github.com/ansible-collections/ansible.posix/pull/466)." diff --git a/tests/integration/targets/acl/tasks/main.yml b/tests/integration/targets/acl/tasks/main.yml index 84af286..264f04a 100644 --- a/tests/integration/targets/acl/tasks/main.yml +++ b/tests/integration/targets/acl/tasks/main.yml @@ -17,7 +17,7 @@ - block: - - include: acl.yml + - include_tasks: acl.yml when: ansible_system == 'Linux' # TODO enable acls mount option on FreeBSD to test it there too always: diff --git a/tests/integration/targets/seboolean/tasks/main.yml b/tests/integration/targets/seboolean/tasks/main.yml index df21691..c8a5ffe 100644 --- a/tests/integration/targets/seboolean/tasks/main.yml +++ b/tests/integration/targets/seboolean/tasks/main.yml @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -- include: seboolean.yml +- include_tasks: seboolean.yml when: - ansible_selinux is defined - ansible_selinux != False diff --git a/tests/integration/targets/selinux/tasks/main.yml b/tests/integration/targets/selinux/tasks/main.yml index 41fdca5..a5fed6b 100644 --- a/tests/integration/targets/selinux/tasks/main.yml +++ b/tests/integration/targets/selinux/tasks/main.yml @@ -23,13 +23,13 @@ msg: SELinux is {{ ansible_selinux.status }} when: ansible_selinux is defined and ansible_selinux != False -- include: selinux.yml +- include_tasks: selinux.yml when: - ansible_selinux is defined - ansible_selinux != False - ansible_selinux.status == 'enabled' -- include: selogin.yml +- include_tasks: selogin.yml when: - ansible_selinux is defined - ansible_selinux != False