From 2d27dbd9ea4fb1d9524b0c9d3e9ede6c555064d1 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Fri, 19 May 2023 20:45:25 +0200 Subject: [PATCH] [PR #6535/ddca52ee backport][stable-6] CI: include has finally been removed in ansible-core devel (#6536) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI: include has finally been removed in ansible-core devel (#6535) include: → include_tasks:. (cherry picked from commit ddca52ee15715c3460868be283cebd258a138c20) Co-authored-by: Felix Fontein --- .../targets/apache2_module/tasks/main.yml | 4 ++-- .../integration/targets/influxdb_user/tasks/main.yml | 2 +- tests/integration/targets/locale_gen/tasks/main.yml | 2 +- tests/integration/targets/mqtt/tasks/main.yml | 2 +- tests/integration/targets/pacman/tasks/main.yml | 12 ++++++------ tests/integration/targets/pkgng/tasks/freebsd.yml | 2 +- tests/integration/targets/sefcontext/tasks/main.yml | 2 +- .../integration/targets/sensu_handler/tasks/main.yml | 10 +++++----- .../targets/setup_influxdb/tasks/main.yml | 2 +- .../targets/setup_mosquitto/tasks/main.yml | 2 +- .../integration/targets/setup_pkg_mgr/tasks/main.yml | 2 +- tests/integration/targets/ssh_config/tasks/main.yml | 2 +- tests/integration/targets/sysrc/tasks/main.yml | 2 +- tests/integration/targets/xattr/tasks/main.yml | 4 ++-- tests/integration/targets/yarn/tasks/main.yml | 2 +- tests/integration/targets/zypper/tasks/main.yml | 2 +- .../targets/zypper_repository/tasks/main.yml | 2 +- .../targets/zypper_repository/tasks/test.yml | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/integration/targets/apache2_module/tasks/main.yml b/tests/integration/targets/apache2_module/tasks/main.yml index 70ba14ea24..6f2f718ad0 100644 --- a/tests/integration/targets/apache2_module/tasks/main.yml +++ b/tests/integration/targets/apache2_module/tasks/main.yml @@ -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 @@ -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 \ No newline at end of file diff --git a/tests/integration/targets/influxdb_user/tasks/main.yml b/tests/integration/targets/influxdb_user/tasks/main.yml index 23c37b7960..7da2f85e5f 100644 --- a/tests/integration/targets/influxdb_user/tasks/main.yml +++ b/tests/integration/targets/influxdb_user/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/locale_gen/tasks/main.yml b/tests/integration/targets/locale_gen/tasks/main.yml index 1616f8fc32..de3e673beb 100644 --- a/tests/integration/targets/locale_gen/tasks/main.yml +++ b/tests/integration/targets/locale_gen/tasks/main.yml @@ -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') diff --git a/tests/integration/targets/mqtt/tasks/main.yml b/tests/integration/targets/mqtt/tasks/main.yml index 6403b20181..0beb1b3b27 100644 --- a/tests/integration/targets/mqtt/tasks/main.yml +++ b/tests/integration/targets/mqtt/tasks/main.yml @@ -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'] diff --git a/tests/integration/targets/pacman/tasks/main.yml b/tests/integration/targets/pacman/tasks/main.yml index 95f4374b75..12d28a2d3e 100644 --- a/tests/integration/targets/pacman/tasks/main.yml +++ b/tests/integration/targets/pacman/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/pkgng/tasks/freebsd.yml b/tests/integration/targets/pkgng/tasks/freebsd.yml index bac5f62942..0c8001899f 100644 --- a/tests/integration/targets/pkgng/tasks/freebsd.yml +++ b/tests/integration/targets/pkgng/tasks/freebsd.yml @@ -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 diff --git a/tests/integration/targets/sefcontext/tasks/main.yml b/tests/integration/targets/sefcontext/tasks/main.yml index 8eeac62fb5..04143d1cbc 100644 --- a/tests/integration/targets/sefcontext/tasks/main.yml +++ b/tests/integration/targets/sefcontext/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/sensu_handler/tasks/main.yml b/tests/integration/targets/sensu_handler/tasks/main.yml index 606be6b789..ec73a14c44 100644 --- a/tests/integration/targets/sensu_handler/tasks/main.yml +++ b/tests/integration/targets/sensu_handler/tasks/main.yml @@ -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 diff --git a/tests/integration/targets/setup_influxdb/tasks/main.yml b/tests/integration/targets/setup_influxdb/tasks/main.yml index 939a49da73..bc64ab319d 100644 --- a/tests/integration/targets/setup_influxdb/tasks/main.yml +++ b/tests/integration/targets/setup_influxdb/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/setup_mosquitto/tasks/main.yml b/tests/integration/targets/setup_mosquitto/tasks/main.yml index 836d94529e..2dd0674dc2 100644 --- a/tests/integration/targets/setup_mosquitto/tasks/main.yml +++ b/tests/integration/targets/setup_mosquitto/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml index 7c6ab4ef9f..5bff53b3b1 100644 --- a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml +++ b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml @@ -36,4 +36,4 @@ - when: ansible_os_family == "Archlinux" block: - name: ArchLinux specific setup - include: archlinux.yml + include_tasks: archlinux.yml diff --git a/tests/integration/targets/ssh_config/tasks/main.yml b/tests/integration/targets/ssh_config/tasks/main.yml index 290639e83e..c8b96d0c09 100644 --- a/tests/integration/targets/ssh_config/tasks/main.yml +++ b/tests/integration/targets/ssh_config/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/sysrc/tasks/main.yml b/tests/integration/targets/sysrc/tasks/main.yml index 83e7fe9ed0..2c45c3b1c2 100644 --- a/tests/integration/targets/sysrc/tasks/main.yml +++ b/tests/integration/targets/sysrc/tasks/main.yml @@ -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: diff --git a/tests/integration/targets/xattr/tasks/main.yml b/tests/integration/targets/xattr/tasks/main.yml index b6e93d92bc..6c1c02b3e9 100644 --- a/tests/integration/targets/xattr/tasks/main.yml +++ b/tests/integration/targets/xattr/tasks/main.yml @@ -9,7 +9,7 @@ # 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 }} @@ -17,5 +17,5 @@ register: xattr - name: Test - include: test.yml + include_tasks: test.yml when: xattr is not failed diff --git a/tests/integration/targets/yarn/tasks/main.yml b/tests/integration/targets/yarn/tasks/main.yml index e8f4d0e6a2..e12d891c29 100644 --- a/tests/integration/targets/yarn/tasks/main.yml +++ b/tests/integration/targets/yarn/tasks/main.yml @@ -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 }}' diff --git a/tests/integration/targets/zypper/tasks/main.yml b/tests/integration/targets/zypper/tasks/main.yml index e12c64839d..185f2f90ab 100644 --- a/tests/integration/targets/zypper/tasks/main.yml +++ b/tests/integration/targets/zypper/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/zypper_repository/tasks/main.yml b/tests/integration/targets/zypper_repository/tasks/main.yml index 67fd4dde35..1d655a56fc 100644 --- a/tests/integration/targets/zypper_repository/tasks/main.yml +++ b/tests/integration/targets/zypper_repository/tasks/main.yml @@ -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' diff --git a/tests/integration/targets/zypper_repository/tasks/test.yml b/tests/integration/targets/zypper_repository/tasks/test.yml index 2f030daf48..739b4c2642 100644 --- a/tests/integration/targets/zypper_repository/tasks/test.yml +++ b/tests/integration/targets/zypper_repository/tasks/test.yml @@ -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: