diff --git a/tests/ansible/all.yml b/tests/ansible/all.yml index a68831f7..e074a384 100644 --- a/tests/ansible/all.yml +++ b/tests/ansible/all.yml @@ -1,3 +1,3 @@ -- import_playbook: regression/all.yml -- import_playbook: integration/all.yml +- include: regression/all.yml +- include: integration/all.yml diff --git a/tests/ansible/integration/action/all.yml b/tests/ansible/integration/action/all.yml index 018973a9..461c742b 100644 --- a/tests/ansible/integration/action/all.yml +++ b/tests/ansible/integration/action/all.yml @@ -1,9 +1,9 @@ -- import_playbook: copy.yml -- import_playbook: fixup_perms2__copy.yml -- import_playbook: low_level_execute_command.yml -- import_playbook: make_tmp_path.yml -- import_playbook: remote_expand_user.yml -- import_playbook: remote_file_exists.yml -- import_playbook: remove_tmp_path.yml -- import_playbook: synchronize.yml -- import_playbook: transfer_data.yml +- include: copy.yml +- include: fixup_perms2__copy.yml +- include: low_level_execute_command.yml +- include: make_tmp_path.yml +- include: remote_expand_user.yml +- include: remote_file_exists.yml +- include: remove_tmp_path.yml +- include: synchronize.yml +- include: transfer_data.yml diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index 43c4db96..3a149d6d 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -3,18 +3,18 @@ # This playbook imports all tests that are known to work at present. # -- import_playbook: action/all.yml -- import_playbook: async/all.yml -- import_playbook: become/all.yml -- import_playbook: connection/all.yml -- import_playbook: connection_delegation/all.yml -- import_playbook: connection_loader/all.yml -- import_playbook: context_service/all.yml -- import_playbook: glibc_caches/all.yml -- import_playbook: local/all.yml -- import_playbook: module_utils/all.yml -- import_playbook: playbook_semantics/all.yml -- import_playbook: runner/all.yml -- import_playbook: ssh/all.yml -- import_playbook: strategy/all.yml -- import_playbook: stub_connections/all.yml +- include: action/all.yml +- include: async/all.yml +- include: become/all.yml +- include: connection/all.yml +- include: connection_delegation/all.yml +- include: connection_loader/all.yml +- include: context_service/all.yml +- include: glibc_caches/all.yml +- include: local/all.yml +- include: module_utils/all.yml +- include: playbook_semantics/all.yml +- include: runner/all.yml +- include: ssh/all.yml +- include: strategy/all.yml +- include: stub_connections/all.yml diff --git a/tests/ansible/integration/async/all.yml b/tests/ansible/integration/async/all.yml index 61d2d35c..f14537ed 100644 --- a/tests/ansible/integration/async/all.yml +++ b/tests/ansible/integration/async/all.yml @@ -1,9 +1,9 @@ -- import_playbook: multiple_items_loop.yml -- import_playbook: result_binary_producing_json.yml -- import_playbook: result_binary_producing_junk.yml -- import_playbook: result_shell_echo_hi.yml -- import_playbook: runner_new_process.yml -- import_playbook: runner_one_job.yml -- import_playbook: runner_timeout_then_polling.yml -- import_playbook: runner_two_simultaneous_jobs.yml -- import_playbook: runner_with_polling_and_timeout.yml +- include: multiple_items_loop.yml +- include: result_binary_producing_json.yml +- include: result_binary_producing_junk.yml +- include: result_shell_echo_hi.yml +- include: runner_new_process.yml +- include: runner_one_job.yml +- include: runner_timeout_then_polling.yml +- include: runner_two_simultaneous_jobs.yml +- include: runner_with_polling_and_timeout.yml diff --git a/tests/ansible/integration/become/all.yml b/tests/ansible/integration/become/all.yml index c9c331dd..5fa030d1 100644 --- a/tests/ansible/integration/become/all.yml +++ b/tests/ansible/integration/become/all.yml @@ -1,7 +1,7 @@ -- import_playbook: su_password.yml -- import_playbook: sudo_flags_failure.yml -- import_playbook: sudo_nonexistent.yml -- import_playbook: sudo_nopassword.yml -- import_playbook: sudo_password.yml -- import_playbook: sudo_requiretty.yml +- include: su_password.yml +- include: sudo_flags_failure.yml +- include: sudo_nonexistent.yml +- include: sudo_nopassword.yml +- include: sudo_password.yml +- include: sudo_requiretty.yml diff --git a/tests/ansible/integration/connection/all.yml b/tests/ansible/integration/connection/all.yml index 9c5a2837..cead0128 100644 --- a/tests/ansible/integration/connection/all.yml +++ b/tests/ansible/integration/connection/all.yml @@ -1,8 +1,8 @@ --- -- import_playbook: disconnect_during_module.yml -- import_playbook: disconnect_resets_connection.yml -- import_playbook: exec_command.yml -- import_playbook: put_large_file.yml -- import_playbook: put_small_file.yml -- import_playbook: reset.yml +- include: disconnect_during_module.yml +- include: disconnect_resets_connection.yml +- include: exec_command.yml +- include: put_large_file.yml +- include: put_small_file.yml +- include: reset.yml diff --git a/tests/ansible/integration/connection/put_large_file.yml b/tests/ansible/integration/connection/put_large_file.yml index 210c5d6a..392731df 100644 --- a/tests/ansible/integration/connection/put_large_file.yml +++ b/tests/ansible/integration/connection/put_large_file.yml @@ -9,4 +9,4 @@ file_name: large-file file_size: 512 tasks: - - include_tasks: _put_file.yml + - include: _put_file.yml diff --git a/tests/ansible/integration/connection/put_small_file.yml b/tests/ansible/integration/connection/put_small_file.yml index aa6cc0d7..d9423f75 100644 --- a/tests/ansible/integration/connection/put_small_file.yml +++ b/tests/ansible/integration/connection/put_small_file.yml @@ -9,4 +9,4 @@ file_name: small-file file_size: 123 tasks: - - include_tasks: _put_file.yml + - include: _put_file.yml diff --git a/tests/ansible/integration/connection_delegation/all.yml b/tests/ansible/integration/connection_delegation/all.yml index 8d5ffe03..c9b09687 100644 --- a/tests/ansible/integration/connection_delegation/all.yml +++ b/tests/ansible/integration/connection_delegation/all.yml @@ -1,5 +1,5 @@ -- import_playbook: delegate_to_template.yml -- import_playbook: local_action.yml -- import_playbook: osa_container_standalone.yml -- import_playbook: osa_delegate_to_self.yml -- import_playbook: stack_construction.yml +- include: delegate_to_template.yml +- include: local_action.yml +- include: osa_container_standalone.yml +- include: osa_delegate_to_self.yml +- include: stack_construction.yml diff --git a/tests/ansible/integration/connection_loader/all.yml b/tests/ansible/integration/connection_loader/all.yml index 7a44bb2f..76ffe8f4 100644 --- a/tests/ansible/integration/connection_loader/all.yml +++ b/tests/ansible/integration/connection_loader/all.yml @@ -1,3 +1,3 @@ -- import_playbook: local_blemished.yml -- import_playbook: paramiko_unblemished.yml -- import_playbook: ssh_blemished.yml +- include: local_blemished.yml +- include: paramiko_unblemished.yml +- include: ssh_blemished.yml diff --git a/tests/ansible/integration/context_service/all.yml b/tests/ansible/integration/context_service/all.yml index c10d67cb..79148f7a 100644 --- a/tests/ansible/integration/context_service/all.yml +++ b/tests/ansible/integration/context_service/all.yml @@ -1,3 +1,3 @@ -- import_playbook: disconnect_cleanup.yml -- import_playbook: lru_one_target.yml -- import_playbook: reconnection.yml +- include: disconnect_cleanup.yml +- include: lru_one_target.yml +- include: reconnection.yml diff --git a/tests/ansible/integration/glibc_caches/all.yml b/tests/ansible/integration/glibc_caches/all.yml index 7d524540..8cff4ea8 100644 --- a/tests/ansible/integration/glibc_caches/all.yml +++ b/tests/ansible/integration/glibc_caches/all.yml @@ -1,2 +1,2 @@ -- import_playbook: resolv_conf.yml +- include: resolv_conf.yml diff --git a/tests/ansible/integration/local/all.yml b/tests/ansible/integration/local/all.yml index 383a9108..5f8b4dd4 100644 --- a/tests/ansible/integration/local/all.yml +++ b/tests/ansible/integration/local/all.yml @@ -1,4 +1,4 @@ -- import_playbook: cwd_preserved.yml -- import_playbook: env_preserved.yml +- include: cwd_preserved.yml +- include: env_preserved.yml diff --git a/tests/ansible/integration/module_utils/all.yml b/tests/ansible/integration/module_utils/all.yml index c8b8f2fb..b68e2ee3 100644 --- a/tests/ansible/integration/module_utils/all.yml +++ b/tests/ansible/integration/module_utils/all.yml @@ -1,6 +1,6 @@ -#- import_playbook: from_config_path.yml -#- import_playbook: from_config_path_pkg.yml -#- import_playbook: adjacent_to_playbook.yml -- import_playbook: adjacent_to_role.yml -#- import_playbook: overrides_builtin.yml +#- include: from_config_path.yml +#- include: from_config_path_pkg.yml +#- include: adjacent_to_playbook.yml +- include: adjacent_to_role.yml +#- include: overrides_builtin.yml diff --git a/tests/ansible/integration/playbook_semantics/all.yml b/tests/ansible/integration/playbook_semantics/all.yml index 6c8dd065..ec7a9a07 100644 --- a/tests/ansible/integration/playbook_semantics/all.yml +++ b/tests/ansible/integration/playbook_semantics/all.yml @@ -1,4 +1,4 @@ -- import_playbook: become_flags.yml -- import_playbook: delegate_to.yml -- import_playbook: environment.yml -- import_playbook: with_items.yml +- include: become_flags.yml +- include: delegate_to.yml +- include: environment.yml +- include: with_items.yml diff --git a/tests/ansible/integration/runner/all.yml b/tests/ansible/integration/runner/all.yml index 9dd209d7..94092aa5 100644 --- a/tests/ansible/integration/runner/all.yml +++ b/tests/ansible/integration/runner/all.yml @@ -1,21 +1,21 @@ -- import_playbook: atexit.yml -- import_playbook: builtin_command_module.yml -- import_playbook: custom_bash_hashbang_argument.yml -- import_playbook: custom_bash_old_style_module.yml -- import_playbook: custom_bash_want_json_module.yml -- import_playbook: custom_binary_producing_json.yml -- import_playbook: custom_binary_producing_junk.yml -- import_playbook: custom_binary_single_null.yml -- import_playbook: custom_perl_json_args_module.yml -- import_playbook: custom_perl_want_json_module.yml -- import_playbook: custom_python_json_args_module.yml -- import_playbook: custom_python_new_style_missing_interpreter.yml -- import_playbook: custom_python_new_style_module.yml -- import_playbook: custom_python_want_json_module.yml -- import_playbook: custom_script_interpreter.yml -- import_playbook: environment_isolation.yml -- import_playbook: etc_environment.yml -- import_playbook: forking_active.yml -- import_playbook: forking_correct_parent.yml -- import_playbook: forking_inactive.yml -- import_playbook: missing_module.yml +- include: atexit.yml +- include: builtin_command_module.yml +- include: custom_bash_hashbang_argument.yml +- include: custom_bash_old_style_module.yml +- include: custom_bash_want_json_module.yml +- include: custom_binary_producing_json.yml +- include: custom_binary_producing_junk.yml +- include: custom_binary_single_null.yml +- include: custom_perl_json_args_module.yml +- include: custom_perl_want_json_module.yml +- include: custom_python_json_args_module.yml +- include: custom_python_new_style_missing_interpreter.yml +- include: custom_python_new_style_module.yml +- include: custom_python_want_json_module.yml +- include: custom_script_interpreter.yml +- include: environment_isolation.yml +- include: etc_environment.yml +- include: forking_active.yml +- include: forking_correct_parent.yml +- include: forking_inactive.yml +- include: missing_module.yml diff --git a/tests/ansible/integration/runner/etc_environment.yml b/tests/ansible/integration/runner/etc_environment.yml index 7eb405cb..ecdb8aa6 100644 --- a/tests/ansible/integration/runner/etc_environment.yml +++ b/tests/ansible/integration/runner/etc_environment.yml @@ -7,9 +7,9 @@ any_errors_fatal: true gather_facts: true tasks: - - include_tasks: _etc_environment_user.yml + - include: _etc_environment_user.yml when: ansible_system == "Linux" and is_mitogen - - include_tasks: _etc_environment_global.yml + - include: _etc_environment_global.yml # Don't destroy laptops. when: ansible_virtualization_type == "docker" diff --git a/tests/ansible/integration/ssh/all.yml b/tests/ansible/integration/ssh/all.yml index a8335ab7..28495f49 100644 --- a/tests/ansible/integration/ssh/all.yml +++ b/tests/ansible/integration/ssh/all.yml @@ -1,3 +1,3 @@ -- import_playbook: config.yml -- import_playbook: timeouts.yml -- import_playbook: variables.yml +- include: config.yml +- include: timeouts.yml +- include: variables.yml diff --git a/tests/ansible/integration/strategy/all.yml b/tests/ansible/integration/strategy/all.yml index 3304817c..b519e1bc 100644 --- a/tests/ansible/integration/strategy/all.yml +++ b/tests/ansible/integration/strategy/all.yml @@ -1 +1 @@ -- import_playbook: mixed_vanilla_mitogen.yml +- include: mixed_vanilla_mitogen.yml diff --git a/tests/ansible/integration/stub_connections/all.yml b/tests/ansible/integration/stub_connections/all.yml index a9744ab7..e1810138 100644 --- a/tests/ansible/integration/stub_connections/all.yml +++ b/tests/ansible/integration/stub_connections/all.yml @@ -1,7 +1,7 @@ -- import_playbook: kubectl.yml -- import_playbook: lxc.yml -- import_playbook: lxd.yml -- import_playbook: mitogen_doas.yml -- import_playbook: mitogen_sudo.yml -- import_playbook: setns_lxc.yml -- import_playbook: setns_lxd.yml +- include: kubectl.yml +- include: lxc.yml +- include: lxd.yml +- include: mitogen_doas.yml +- include: mitogen_sudo.yml +- include: setns_lxc.yml +- include: setns_lxd.yml diff --git a/tests/ansible/integration/stub_connections/setns_lxc.yml b/tests/ansible/integration/stub_connections/setns_lxc.yml index 42f6658a..c57a8c5c 100644 --- a/tests/ansible/integration/stub_connections/setns_lxc.yml +++ b/tests/ansible/integration/stub_connections/setns_lxc.yml @@ -11,7 +11,7 @@ - meta: end_play when: not is_mitogen - - include_tasks: _end_play_if_not_sudo_linux.yml + - include: _end_play_if_not_sudo_linux.yml - command: | sudo -nE "{{lookup('env', 'VIRTUAL_ENV')}}/bin/ansible" diff --git a/tests/ansible/integration/stub_connections/setns_lxd.yml b/tests/ansible/integration/stub_connections/setns_lxd.yml index b7add672..7db47661 100644 --- a/tests/ansible/integration/stub_connections/setns_lxd.yml +++ b/tests/ansible/integration/stub_connections/setns_lxd.yml @@ -11,7 +11,7 @@ - meta: end_play when: not is_mitogen - - include_tasks: _end_play_if_not_sudo_linux.yml + - include: _end_play_if_not_sudo_linux.yml - command: | sudo -nE "{{lookup('env', 'VIRTUAL_ENV')}}/bin/ansible" diff --git a/tests/ansible/integration/transport/all.yml b/tests/ansible/integration/transport/all.yml index 89949b58..534534db 100644 --- a/tests/ansible/integration/transport/all.yml +++ b/tests/ansible/integration/transport/all.yml @@ -1,2 +1,2 @@ -- import_playbook: kubectl.yml +- include: kubectl.yml diff --git a/tests/ansible/soak/file_service.yml b/tests/ansible/soak/file_service.yml index 3b338b3c..0640233a 100644 --- a/tests/ansible/soak/file_service.yml +++ b/tests/ansible/soak/file_service.yml @@ -2,5 +2,5 @@ tasks: - set_fact: content: "{% for x in range(126977) %}x{% endfor %}" - - include_tasks: _file_service_loop.yml + - include: _file_service_loop.yml with_sequence: start=1 end=100