From 478f286efb6653194b752d42c1c94a3c625731eb Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 20:34:52 +0100 Subject: [PATCH] Revert "fixed tests for ansible 2.12" include is deprecated and will be removed in 2.16, so there is some time to fix this left This reverts commit 2d3970552ed340a3b839d9cdc2e2da98d844a2a5. --- tests/ansible/integration/action/all.yml | 20 ++++---- tests/ansible/integration/async/all.yml | 18 ++++---- tests/ansible/integration/become/all.yml | 12 ++--- tests/ansible/integration/connection/all.yml | 18 ++++---- .../integration/connection_delegation/all.yml | 10 ++-- .../integration/connection_loader/all.yml | 6 +-- .../integration/context_service/all.yml | 8 ++-- .../ansible/integration/glibc_caches/all.yml | 2 +- .../integration/interpreter_discovery/all.yml | 4 +- tests/ansible/integration/local/all.yml | 4 +- .../ansible/integration/module_utils/all.yml | 10 ++-- .../integration/playbook_semantics/all.yml | 8 ++-- tests/ansible/integration/process/all.yml | 2 +- tests/ansible/integration/runner/all.yml | 46 +++++++++---------- tests/ansible/integration/ssh/all.yml | 6 +-- tests/ansible/integration/strategy/all.yml | 2 +- .../integration/stub_connections/all.yml | 14 +++--- .../integration/transport_config/all.yml | 22 ++++----- 18 files changed, 106 insertions(+), 106 deletions(-) diff --git a/tests/ansible/integration/action/all.yml b/tests/ansible/integration/action/all.yml index d823e05e..c43d5cc7 100644 --- a/tests/ansible/integration/action/all.yml +++ b/tests/ansible/integration/action/all.yml @@ -1,10 +1,10 @@ -- 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: make_tmp_path__double.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: make_tmp_path__double.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/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 b707b0eb..348857f5 100644 --- a/tests/ansible/integration/connection/all.yml +++ b/tests/ansible/integration/connection/all.yml @@ -1,11 +1,11 @@ --- -- import_playbook: become_same_user.yml -- import_playbook: disconnect_during_module.yml -- import_playbook: disconnect_resets_connection.yml -- import_playbook: exec_command.yml -- import_playbook: home_dir.yml -- import_playbook: put_large_file.yml -- import_playbook: put_small_file.yml -- import_playbook: reset.yml -- import_playbook: reset_become.yml +- include: become_same_user.yml +- include: disconnect_during_module.yml +- include: disconnect_resets_connection.yml +- include: exec_command.yml +- include: home_dir.yml +- include: put_large_file.yml +- include: put_small_file.yml +- include: reset.yml +- include: reset_become.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 edcf8eff..7770629a 100644 --- a/tests/ansible/integration/context_service/all.yml +++ b/tests/ansible/integration/context_service/all.yml @@ -1,4 +1,4 @@ -- import_playbook: disconnect_cleanup.yml -- import_playbook: lru_one_target.yml -- import_playbook: reconnection.yml -- import_playbook: remote_name.yml +- include: disconnect_cleanup.yml +- include: lru_one_target.yml +- include: reconnection.yml +- include: remote_name.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/interpreter_discovery/all.yml b/tests/ansible/integration/interpreter_discovery/all.yml index 56fbc622..403fd761 100644 --- a/tests/ansible/integration/interpreter_discovery/all.yml +++ b/tests/ansible/integration/interpreter_discovery/all.yml @@ -1,2 +1,2 @@ -- import_playbook: complex_args.yml -- import_playbook: ansible_2_8_tests.yml +- include: complex_args.yml +- include: ansible_2_8_tests.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/process/all.yml b/tests/ansible/integration/process/all.yml index c50d6bd5..a309113a 100644 --- a/tests/ansible/integration/process/all.yml +++ b/tests/ansible/integration/process/all.yml @@ -1 +1 @@ -- import_playbook: "unix_socket_cleanup.yml" +- include: "unix_socket_cleanup.yml" diff --git a/tests/ansible/integration/runner/all.yml b/tests/ansible/integration/runner/all.yml index 5de9fb27..19586547 100644 --- a/tests/ansible/integration/runner/all.yml +++ b/tests/ansible/integration/runner/all.yml @@ -1,24 +1,24 @@ -- import_playbook: atexit.yml -- import_playbook: builtin_command_module.yml -- import_playbook: crashy_new_style_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_prehistoric_module.yml -- import_playbook: custom_python_want_json_module.yml -- import_playbook: custom_script_interpreter.yml -- import_playbook: environment_isolation.yml +- include: atexit.yml +- include: builtin_command_module.yml +- include: crashy_new_style_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_prehistoric_module.yml +- include: custom_python_want_json_module.yml +- include: custom_script_interpreter.yml +- include: environment_isolation.yml # I hate this test. I hope it dies, it has caused nothing but misery and suffering -#- 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: 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/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/transport_config/all.yml b/tests/ansible/integration/transport_config/all.yml index 548e7f7e..d4ed832f 100644 --- a/tests/ansible/integration/transport_config/all.yml +++ b/tests/ansible/integration/transport_config/all.yml @@ -1,11 +1,11 @@ -- import_playbook: become_method.yml -- import_playbook: become_pass.yml -- import_playbook: become_user.yml -- import_playbook: become.yml -- import_playbook: password.yml -- import_playbook: port.yml -- import_playbook: python_path.yml -- import_playbook: remote_addr.yml -- import_playbook: remote_user.yml -- import_playbook: transport.yml -- import_playbook: transport__smart.yml +- include: become_method.yml +- include: become_pass.yml +- include: become_user.yml +- include: become.yml +- include: password.yml +- include: port.yml +- include: python_path.yml +- include: remote_addr.yml +- include: remote_user.yml +- include: transport.yml +- include: transport__smart.yml