diff --git a/tests/ansible/integration/action/all.yml b/tests/ansible/integration/action/all.yml new file mode 100644 index 00000000..0f61d043 --- /dev/null +++ b/tests/ansible/integration/action/all.yml @@ -0,0 +1,2 @@ +- import_playbook: level_execute_command.yml + diff --git a/tests/ansible/integration/action__low_level_execute_command.yml b/tests/ansible/integration/action/low_level_execute_command.yml similarity index 100% rename from tests/ansible/integration/action__low_level_execute_command.yml rename to tests/ansible/integration/action/low_level_execute_command.yml diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index 87459301..c9bb1908 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -3,6 +3,7 @@ # This playbook imports all tests that are known to work at present. # +- import_playbook: action/all.yml - import_playbook: connection_loader/all.yml -- import_playbook: action__low_level_execute_command.yml -- import_playbook: runner.yml +- import_playbook: runner/all.yml +- import_playbook: playbook_semantics/all.yml diff --git a/tests/ansible/integration/playbook_semantics/all.yml b/tests/ansible/integration/playbook_semantics/all.yml new file mode 100644 index 00000000..40fa70b7 --- /dev/null +++ b/tests/ansible/integration/playbook_semantics/all.yml @@ -0,0 +1,3 @@ +- import_playbook: become_flags.yml +- import_playbook: delegate_to.yml +- import_playbook: environment.yml diff --git a/tests/ansible/integration/playbook__become_flags.yml b/tests/ansible/integration/playbook_semantics/become_flags.yml similarity index 100% rename from tests/ansible/integration/playbook__become_flags.yml rename to tests/ansible/integration/playbook_semantics/become_flags.yml diff --git a/tests/ansible/integration/playbook__delegate_to.yml b/tests/ansible/integration/playbook_semantics/delegate_to.yml similarity index 100% rename from tests/ansible/integration/playbook__delegate_to.yml rename to tests/ansible/integration/playbook_semantics/delegate_to.yml diff --git a/tests/ansible/integration/playbook__environment.yml b/tests/ansible/integration/playbook_semantics/environment.yml similarity index 100% rename from tests/ansible/integration/playbook__environment.yml rename to tests/ansible/integration/playbook_semantics/environment.yml diff --git a/tests/ansible/integration/runner.yml b/tests/ansible/integration/runner.yml deleted file mode 100644 index 51583ba3..00000000 --- a/tests/ansible/integration/runner.yml +++ /dev/null @@ -1,12 +0,0 @@ -- import_playbook: runner__builtin_command_module.yml -- import_playbook: runner__custom_bash_old_style_module.yml -- import_playbook: runner__custom_bash_want_json_module.yml -- import_playbook: runner__custom_binary_producing_json.yml -- import_playbook: runner__custom_binary_producing_junk.yml -- import_playbook: runner__custom_binary_single_null.yml -- import_playbook: runner__custom_perl_json_args_module.yml -- import_playbook: runner__custom_perl_want_json_module.yml -- import_playbook: runner__custom_python_json_args_module.yml -- import_playbook: runner__custom_python_new_style_module.yml -- import_playbook: runner__custom_python_want_json_module.yml -- import_playbook: runner__remote_tmp.yml diff --git a/tests/ansible/integration/runner/all.yml b/tests/ansible/integration/runner/all.yml new file mode 100644 index 00000000..b2424b6b --- /dev/null +++ b/tests/ansible/integration/runner/all.yml @@ -0,0 +1,12 @@ +- import_playbook: builtin_command_module.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_module.yml +- import_playbook: custom_python_want_json_module.yml +- import_playbook: remote_tmp.yml diff --git a/tests/ansible/integration/runner__builtin_command_module.yml b/tests/ansible/integration/runner/builtin_command_module.yml similarity index 100% rename from tests/ansible/integration/runner__builtin_command_module.yml rename to tests/ansible/integration/runner/builtin_command_module.yml diff --git a/tests/ansible/integration/runner__custom_bash_old_style_module.yml b/tests/ansible/integration/runner/custom_bash_old_style_module.yml similarity index 100% rename from tests/ansible/integration/runner__custom_bash_old_style_module.yml rename to tests/ansible/integration/runner/custom_bash_old_style_module.yml diff --git a/tests/ansible/integration/runner__custom_bash_want_json_module.yml b/tests/ansible/integration/runner/custom_bash_want_json_module.yml similarity index 100% rename from tests/ansible/integration/runner__custom_bash_want_json_module.yml rename to tests/ansible/integration/runner/custom_bash_want_json_module.yml diff --git a/tests/ansible/integration/runner__custom_binary_producing_json.yml b/tests/ansible/integration/runner/custom_binary_producing_json.yml similarity index 100% rename from tests/ansible/integration/runner__custom_binary_producing_json.yml rename to tests/ansible/integration/runner/custom_binary_producing_json.yml diff --git a/tests/ansible/integration/runner__custom_binary_producing_junk.yml b/tests/ansible/integration/runner/custom_binary_producing_junk.yml similarity index 100% rename from tests/ansible/integration/runner__custom_binary_producing_junk.yml rename to tests/ansible/integration/runner/custom_binary_producing_junk.yml diff --git a/tests/ansible/integration/runner__custom_binary_single_null.yml b/tests/ansible/integration/runner/custom_binary_single_null.yml similarity index 100% rename from tests/ansible/integration/runner__custom_binary_single_null.yml rename to tests/ansible/integration/runner/custom_binary_single_null.yml diff --git a/tests/ansible/integration/runner__custom_perl_json_args_module.yml b/tests/ansible/integration/runner/custom_perl_json_args_module.yml similarity index 100% rename from tests/ansible/integration/runner__custom_perl_json_args_module.yml rename to tests/ansible/integration/runner/custom_perl_json_args_module.yml diff --git a/tests/ansible/integration/runner__custom_perl_want_json_module.yml b/tests/ansible/integration/runner/custom_perl_want_json_module.yml similarity index 100% rename from tests/ansible/integration/runner__custom_perl_want_json_module.yml rename to tests/ansible/integration/runner/custom_perl_want_json_module.yml diff --git a/tests/ansible/integration/runner__custom_python_json_args_module.yml b/tests/ansible/integration/runner/custom_python_json_args_module.yml similarity index 100% rename from tests/ansible/integration/runner__custom_python_json_args_module.yml rename to tests/ansible/integration/runner/custom_python_json_args_module.yml diff --git a/tests/ansible/integration/runner__custom_python_new_style_module.yml b/tests/ansible/integration/runner/custom_python_new_style_module.yml similarity index 100% rename from tests/ansible/integration/runner__custom_python_new_style_module.yml rename to tests/ansible/integration/runner/custom_python_new_style_module.yml diff --git a/tests/ansible/integration/runner__custom_python_want_json_module.yml b/tests/ansible/integration/runner/custom_python_want_json_module.yml similarity index 100% rename from tests/ansible/integration/runner__custom_python_want_json_module.yml rename to tests/ansible/integration/runner/custom_python_want_json_module.yml diff --git a/tests/ansible/integration/runner__remote_tmp.yml b/tests/ansible/integration/runner/remote_tmp.yml similarity index 100% rename from tests/ansible/integration/runner__remote_tmp.yml rename to tests/ansible/integration/runner/remote_tmp.yml