Skip to content

Commit

Permalink
CI: include has finally been removed in ansible-core devel (#6535)
Browse files Browse the repository at this point in the history
include: → include_tasks:.
  • Loading branch information
felixfontein authored May 19, 2023
1 parent f833982 commit ddca52e
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions tests/integration/targets/apache2_module/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
shell: apache2ctl -M | sort
register: modules_before
- name: include only on supported systems
include: actualtest.yml
include_tasks: actualtest.yml
always:
- name: get list of enabled modules
shell: apache2ctl -M | sort
Expand All @@ -47,6 +47,6 @@
# centos/RHEL does not have a2enmod/a2dismod

- name: include misleading warning test
include: 635-apache2-misleading-warning.yml
include_tasks: 635-apache2-misleading-warning.yml
when: ansible_os_family in ['Debian']
# Suse has mpm_event module compiled within the base apache2
2 changes: 1 addition & 1 deletion tests/integration/targets/influxdb_user/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

- include: tests.yml
- include_tasks: tests.yml
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
2 changes: 1 addition & 1 deletion tests/integration/targets/locale_gen/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

- include: 'locale_gen.yml'
- include_tasks: 'locale_gen.yml'
when: ansible_distribution in ('Ubuntu', 'Debian')
2 changes: 1 addition & 1 deletion tests/integration/targets/mqtt/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

- include: ubuntu.yml
- include_tasks: ubuntu.yml
when:
- ansible_distribution == 'Ubuntu'
- ansible_distribution_release not in ['focal', 'jammy']
12 changes: 6 additions & 6 deletions tests/integration/targets/pacman/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
- when: ansible_os_family == 'Archlinux'
block:
# Add more tests here by including more task files:
- include: 'basic.yml'
- include: 'package_urls.yml'
- include: 'remove_nosave.yml'
- include: 'update_cache.yml'
- include: 'locally_installed_package.yml'
- include: 'reason.yml'
- include_tasks: 'basic.yml'
- include_tasks: 'package_urls.yml'
- include_tasks: 'remove_nosave.yml'
- include_tasks: 'update_cache.yml'
- include_tasks: 'locally_installed_package.yml'
- include_tasks: 'reason.yml'
2 changes: 1 addition & 1 deletion tests/integration/targets/pkgng/tasks/freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
or ansible_distribution_version is version('13.3', '>=')
block:
- name: Setup testjail
include: setup-testjail.yml
include_tasks: setup-testjail.yml

- name: Install package in jail as rootdir
include_tasks: install_single_package.yml
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/sefcontext/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
msg: SELinux is {{ ansible_selinux.status }}
when: ansible_selinux is defined and ansible_selinux != False

- include: sefcontext.yml
- include_tasks: sefcontext.yml
when: ansible_selinux is defined and ansible_selinux != False and ansible_selinux.status == 'enabled'
10 changes: 5 additions & 5 deletions tests/integration/targets/sensu_handler/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@
- failure is failed
- "'the following are missing: type' in failure['msg']"

- include: pipe.yml
- include: tcp.yml
- include: udp.yml
- include: set.yml
- include: transport.yml
- include_tasks: pipe.yml
- include_tasks: tcp.yml
- include_tasks: udp.yml
- include_tasks: set.yml
- include_tasks: transport.yml
2 changes: 1 addition & 1 deletion tests/integration/targets/setup_influxdb/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

- include: setup.yml
- include_tasks: setup.yml
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
2 changes: 1 addition & 1 deletion tests/integration/targets/setup_mosquitto/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

- include: ubuntu.yml
- include_tasks: ubuntu.yml
when: ansible_distribution == 'Ubuntu'
2 changes: 1 addition & 1 deletion tests/integration/targets/setup_pkg_mgr/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
- when: ansible_os_family == "Archlinux"
block:
- name: ArchLinux specific setup
include: archlinux.yml
include_tasks: archlinux.yml
2 changes: 1 addition & 1 deletion tests/integration/targets/ssh_config/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,4 @@
- short_name.hosts_removed == []

- name: Include integration tests for additional options (e.g. proxycommand, proxyjump)
include: 'options.yml'
include_tasks: 'options.yml'
2 changes: 1 addition & 1 deletion tests/integration/targets/sysrc/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
or ansible_distribution_version is version('13.1', '>=')
block:
- name: Setup testjail
include: setup-testjail.yml
include_tasks: setup-testjail.yml

- name: Enable nginx in test jail
sysrc:
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/targets/xattr/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
# SPDX-License-Identifier: GPL-3.0-or-later

- name: Setup
include: setup.yml
include_tasks: setup.yml

- name: Check availability of xattr support
command: setfattr -n user.foo {{ test_file }}
ignore_errors: true
register: xattr

- name: Test
include: test.yml
include_tasks: test.yml
when: xattr is not failed
2 changes: 1 addition & 1 deletion tests/integration/targets/yarn/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# ============================================================

- include: run.yml
- include_tasks: run.yml
vars:
nodejs_version: '{{ item.node_version }}'
nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_system|lower }}-x{{ ansible_userspace_bits }}'
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/zypper/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

- include: 'zypper.yml'
- include_tasks: 'zypper.yml'
when: ansible_os_family == 'Suse'
2 changes: 1 addition & 1 deletion tests/integration/targets/zypper_repository/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

- include: 'test.yml'
- include_tasks: 'test.yml'
when: ansible_os_family == 'Suse'
2 changes: 1 addition & 1 deletion tests/integration/targets/zypper_repository/tasks/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
command: zypper -n ref

- block:
- include: 'zypper_repository.yml'
- include_tasks: 'zypper_repository.yml'
always:
- name: remove repositories added during test
community.general.zypper_repository:
Expand Down

0 comments on commit ddca52e

Please sign in to comment.