1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

CI: include has finally been removed in ansible-core devel (#6535)

include: → include_tasks:.
This commit is contained in:
Felix Fontein 2023-05-19 20:25:04 +02:00 committed by GitHub
parent f833982d6f
commit ddca52ee15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 29 additions and 29 deletions

View file

@ -29,7 +29,7 @@
shell: apache2ctl -M | sort shell: apache2ctl -M | sort
register: modules_before register: modules_before
- name: include only on supported systems - name: include only on supported systems
include: actualtest.yml include_tasks: actualtest.yml
always: always:
- name: get list of enabled modules - name: get list of enabled modules
shell: apache2ctl -M | sort shell: apache2ctl -M | sort
@ -47,6 +47,6 @@
# centos/RHEL does not have a2enmod/a2dismod # centos/RHEL does not have a2enmod/a2dismod
- name: include misleading warning test - name: include misleading warning test
include: 635-apache2-misleading-warning.yml include_tasks: 635-apache2-misleading-warning.yml
when: ansible_os_family in ['Debian'] when: ansible_os_family in ['Debian']
# Suse has mpm_event module compiled within the base apache2 # Suse has mpm_event module compiled within the base apache2

View file

@ -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) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- include: tests.yml - include_tasks: tests.yml
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty' when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'

View file

@ -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) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- include: 'locale_gen.yml' - include_tasks: 'locale_gen.yml'
when: ansible_distribution in ('Ubuntu', 'Debian') when: ansible_distribution in ('Ubuntu', 'Debian')

View file

@ -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) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- include: ubuntu.yml - include_tasks: ubuntu.yml
when: when:
- ansible_distribution == 'Ubuntu' - ansible_distribution == 'Ubuntu'
- ansible_distribution_release not in ['focal', 'jammy'] - ansible_distribution_release not in ['focal', 'jammy']

View file

@ -11,9 +11,9 @@
- when: ansible_os_family == 'Archlinux' - when: ansible_os_family == 'Archlinux'
block: block:
# Add more tests here by including more task files: # Add more tests here by including more task files:
- include: 'basic.yml' - include_tasks: 'basic.yml'
- include: 'package_urls.yml' - include_tasks: 'package_urls.yml'
- include: 'remove_nosave.yml' - include_tasks: 'remove_nosave.yml'
- include: 'update_cache.yml' - include_tasks: 'update_cache.yml'
- include: 'locally_installed_package.yml' - include_tasks: 'locally_installed_package.yml'
- include: 'reason.yml' - include_tasks: 'reason.yml'

View file

@ -522,7 +522,7 @@
or ansible_distribution_version is version('13.3', '>=') or ansible_distribution_version is version('13.3', '>=')
block: block:
- name: Setup testjail - name: Setup testjail
include: setup-testjail.yml include_tasks: setup-testjail.yml
- name: Install package in jail as rootdir - name: Install package in jail as rootdir
include_tasks: install_single_package.yml include_tasks: install_single_package.yml

View file

@ -17,5 +17,5 @@
msg: SELinux is {{ ansible_selinux.status }} msg: SELinux is {{ ansible_selinux.status }}
when: ansible_selinux is defined and ansible_selinux != False 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' when: ansible_selinux is defined and ansible_selinux != False and ansible_selinux.status == 'enabled'

View file

@ -122,8 +122,8 @@
- failure is failed - failure is failed
- "'the following are missing: type' in failure['msg']" - "'the following are missing: type' in failure['msg']"
- include: pipe.yml - include_tasks: pipe.yml
- include: tcp.yml - include_tasks: tcp.yml
- include: udp.yml - include_tasks: udp.yml
- include: set.yml - include_tasks: set.yml
- include: transport.yml - include_tasks: transport.yml

View file

@ -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) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- include: setup.yml - include_tasks: setup.yml
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty' when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'

View file

@ -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) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- include: ubuntu.yml - include_tasks: ubuntu.yml
when: ansible_distribution == 'Ubuntu' when: ansible_distribution == 'Ubuntu'

View file

@ -36,4 +36,4 @@
- when: ansible_os_family == "Archlinux" - when: ansible_os_family == "Archlinux"
block: block:
- name: ArchLinux specific setup - name: ArchLinux specific setup
include: archlinux.yml include_tasks: archlinux.yml

View file

@ -242,4 +242,4 @@
- short_name.hosts_removed == [] - short_name.hosts_removed == []
- name: Include integration tests for additional options (e.g. proxycommand, proxyjump) - name: Include integration tests for additional options (e.g. proxycommand, proxyjump)
include: 'options.yml' include_tasks: 'options.yml'

View file

@ -147,7 +147,7 @@
or ansible_distribution_version is version('13.1', '>=') or ansible_distribution_version is version('13.1', '>=')
block: block:
- name: Setup testjail - name: Setup testjail
include: setup-testjail.yml include_tasks: setup-testjail.yml
- name: Enable nginx in test jail - name: Enable nginx in test jail
sysrc: sysrc:

View file

@ -9,7 +9,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
- name: Setup - name: Setup
include: setup.yml include_tasks: setup.yml
- name: Check availability of xattr support - name: Check availability of xattr support
command: setfattr -n user.foo {{ test_file }} command: setfattr -n user.foo {{ test_file }}
@ -17,5 +17,5 @@
register: xattr register: xattr
- name: Test - name: Test
include: test.yml include_tasks: test.yml
when: xattr is not failed when: xattr is not failed

View file

@ -11,7 +11,7 @@
# ============================================================ # ============================================================
- include: run.yml - include_tasks: run.yml
vars: vars:
nodejs_version: '{{ item.node_version }}' nodejs_version: '{{ item.node_version }}'
nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_system|lower }}-x{{ ansible_userspace_bits }}' nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_system|lower }}-x{{ ansible_userspace_bits }}'

View file

@ -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) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- include: 'zypper.yml' - include_tasks: 'zypper.yml'
when: ansible_os_family == 'Suse' when: ansible_os_family == 'Suse'

View file

@ -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) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- include: 'test.yml' - include_tasks: 'test.yml'
when: ansible_os_family == 'Suse' when: ansible_os_family == 'Suse'

View file

@ -11,7 +11,7 @@
command: zypper -n ref command: zypper -n ref
- block: - block:
- include: 'zypper_repository.yml' - include_tasks: 'zypper_repository.yml'
always: always:
- name: remove repositories added during test - name: remove repositories added during test
community.general.zypper_repository: community.general.zypper_repository: