From 6fb5502a35328bcfaa38a0ce17a18db4e8987e38 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Tue, 7 Dec 2021 11:53:50 +0100 Subject: [PATCH 01/19] issue #874 support for ansible core 2.12 aka. ansible community 5.0 --- ansible_mitogen/loaders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_mitogen/loaders.py b/ansible_mitogen/loaders.py index 85b6c0e5..b8bbb7e8 100644 --- a/ansible_mitogen/loaders.py +++ b/ansible_mitogen/loaders.py @@ -45,7 +45,7 @@ __all__ = [ ANSIBLE_VERSION_MIN = (2, 10) -ANSIBLE_VERSION_MAX = (2, 11) +ANSIBLE_VERSION_MAX = (2, 12) NEW_VERSION_MSG = ( "Your Ansible version (%s) is too recent. The most recent version\n" From 56c341790c14859020d447650da1fc98f6f73891 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 08:12:04 +0100 Subject: [PATCH 02/19] prepare support for ansible community 5 aka. core 2.12 --- docs/ansible_detailed.rst | 2 +- docs/changelog.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/ansible_detailed.rst b/docs/ansible_detailed.rst index f17e876e..65bcfffd 100644 --- a/docs/ansible_detailed.rst +++ b/docs/ansible_detailed.rst @@ -146,7 +146,7 @@ Noteworthy Differences ---------------------- * Mitogen 0.2.x supports Ansible 2.3-2.9; with Python 2.6, 2.7, or 3.6. - Mitogen 0.3.1+ supports Ansible 2.10, 3, and 4; with Python 2.7, or 3.6-3.9. + Mitogen 0.3.1+ supports Ansible 2.10, 3, 4 and 5; with Python 2.7, or 3.6-3.9. Verify your installation is running one of these versions by checking ``ansible --version`` output. diff --git a/docs/changelog.rst b/docs/changelog.rst index 9165dbda..47586307 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -21,6 +21,7 @@ To avail of fixes in an unreleased version, please download a ZIP file v0.3.1.dev0 (unreleased) ------------------------ +* :gh:issue:`874` Support for Ansible 5 (ansible-core 2.12) * :gh:issue:`774` Fix bootstrap failures on macOS 11.x and 12.x, involving Python 2.7 wrapper * :gh:issue:`834` Support for Ansible 3 and 4 (ansible-core 2.11) * :gh:issue:`869` Continuous Integration tests are now run with Tox From 40fc1f8a2585d65f98e05fce2d9ddb557db189a0 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 13:52:13 +0100 Subject: [PATCH 03/19] issue #874 try to implement the testst for ansible 2.12 --- .ci/azure-pipelines.yml | 23 +++++++++++++++++++++++ tox.ini | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 81ce05f2..3d29c796 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -59,6 +59,9 @@ jobs: Loc_27_4: python.version: '2.7' tox.env: py27-mode_localhost-ansible4 + Loc_27_5: + python.version: '2.7' + tox.env: py27-mode_localhost-ansible5 # NOTE: this hangs when ran in Ubuntu 18.04 Van_27_210: @@ -76,6 +79,11 @@ jobs: tox.env: py27-mode_localhost-ansible4 STRATEGY: linear ANSIBLE_SKIP_TAGS: resource_intensive + Van_27_5: + python.version: '2.7' + tox.env: py27-mode_localhost-ansible5 + STRATEGY: linear + ANSIBLE_SKIP_TAGS: resource_intensive - job: MacLatest # vanilla Ansible is really slow @@ -103,6 +111,8 @@ jobs: tox.env: py27-mode_localhost-ansible3 Loc_27_4: tox.env: py27-mode_localhost-ansible4 + Loc_27_5: + tox.env: py27-mode_localhost-ansible5 # NOTE: this hangs when ran in Ubuntu 18.04 Van_27_210: @@ -117,6 +127,10 @@ jobs: tox.env: py27-mode_localhost-ansible4 STRATEGY: linear ANSIBLE_SKIP_TAGS: resource_intensive + Van_27_5: + tox.env: py27-mode_localhost-ansible5 + STRATEGY: linear + ANSIBLE_SKIP_TAGS: resource_intensive - job: Linux pool: @@ -256,6 +270,9 @@ jobs: Ans_27_4: python.version: '2.7' tox.env: py27-mode_ansible-ansible4 + Ans_27_5: + python.version: '2.7' + tox.env: py27-mode_ansible-ansible5 Ans_36_210: python.version: '3.6' @@ -266,6 +283,9 @@ jobs: Ans_36_4: python.version: '3.6' tox.env: py36-mode_ansible-ansible4 + Ans_36_5: + python.version: '3.6' + tox.env: py36-mode_ansible-ansible5 Ans_39_210: python.version: '3.9' @@ -276,3 +296,6 @@ jobs: Ans_39_4: python.version: '3.9' tox.env: py39-mode_ansible-ansible4 + Ans_39_5: + python.version: '3.9' + tox.env: py39-mode_ansible-ansible5 diff --git a/tox.ini b/tox.ini index 6e51d7ed..1e31b9bf 100644 --- a/tox.ini +++ b/tox.ini @@ -35,7 +35,7 @@ [tox] envlist = init, - py{27,36,39}-mode_ansible-ansible{2.10,3,4}, + py{27,36,39}-mode_ansible-ansible{2.10,3,4,5}, py{27,36,39}-mode_mitogen-distro_centos{6,7,8}, py{27,36,39}-mode_mitogen-distro_debian{9,10,11}, py{27,36,39}-mode_mitogen-distro_ubuntu{1604,1804,2004}, @@ -64,6 +64,7 @@ deps = ansible3: ansible-base<2.10.14 ansible3: ansible==3.4.0 ansible4: ansible==4.8.0 + ansible4: ansible==5.0.1 install_command = python -m pip --no-python-version-warning install {opts} {packages} commands_pre = From 13af356bc9138385d34a7dcf4db75afcfdbbae2b Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 14:13:25 +0100 Subject: [PATCH 04/19] issue #874 tox.ini : fixed ansible5 definition --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1e31b9bf..1820fa01 100644 --- a/tox.ini +++ b/tox.ini @@ -64,7 +64,7 @@ deps = ansible3: ansible-base<2.10.14 ansible3: ansible==3.4.0 ansible4: ansible==4.8.0 - ansible4: ansible==5.0.1 + ansible5: ansible==5.0.1 install_command = python -m pip --no-python-version-warning install {opts} {packages} commands_pre = From b0610cb63c4b22ab64fdc7f2592a977cfd6f1b47 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 14:43:07 +0100 Subject: [PATCH 05/19] issue #874 ansible 2.12 requires min python 3.8 on the controller --- .ci/azure-pipelines.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 3d29c796..3484cd4d 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -59,9 +59,6 @@ jobs: Loc_27_4: python.version: '2.7' tox.env: py27-mode_localhost-ansible4 - Loc_27_5: - python.version: '2.7' - tox.env: py27-mode_localhost-ansible5 # NOTE: this hangs when ran in Ubuntu 18.04 Van_27_210: @@ -79,11 +76,6 @@ jobs: tox.env: py27-mode_localhost-ansible4 STRATEGY: linear ANSIBLE_SKIP_TAGS: resource_intensive - Van_27_5: - python.version: '2.7' - tox.env: py27-mode_localhost-ansible5 - STRATEGY: linear - ANSIBLE_SKIP_TAGS: resource_intensive - job: MacLatest # vanilla Ansible is really slow @@ -111,8 +103,6 @@ jobs: tox.env: py27-mode_localhost-ansible3 Loc_27_4: tox.env: py27-mode_localhost-ansible4 - Loc_27_5: - tox.env: py27-mode_localhost-ansible5 # NOTE: this hangs when ran in Ubuntu 18.04 Van_27_210: @@ -127,10 +117,6 @@ jobs: tox.env: py27-mode_localhost-ansible4 STRATEGY: linear ANSIBLE_SKIP_TAGS: resource_intensive - Van_27_5: - tox.env: py27-mode_localhost-ansible5 - STRATEGY: linear - ANSIBLE_SKIP_TAGS: resource_intensive - job: Linux pool: @@ -270,9 +256,6 @@ jobs: Ans_27_4: python.version: '2.7' tox.env: py27-mode_ansible-ansible4 - Ans_27_5: - python.version: '2.7' - tox.env: py27-mode_ansible-ansible5 Ans_36_210: python.version: '3.6' @@ -283,9 +266,6 @@ jobs: Ans_36_4: python.version: '3.6' tox.env: py36-mode_ansible-ansible4 - Ans_36_5: - python.version: '3.6' - tox.env: py36-mode_ansible-ansible5 Ans_39_210: python.version: '3.9' From 19c28b2b1a56dfdbf3ab838a8e3b8881a5951520 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 23:45:50 +0100 Subject: [PATCH 06/19] fixed tests for ansible 2.12 --- tests/ansible/all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ansible/all.yml b/tests/ansible/all.yml index e8bf26f2..7a3e7000 100644 --- a/tests/ansible/all.yml +++ b/tests/ansible/all.yml @@ -1,6 +1,6 @@ -- include: setup/all.yml +- import_playbook: setup/all.yml tags: setup -- include: regression/all.yml +- import_playbook: regression/all.yml tags: regression -- include: integration/all.yml +- import_playbook: integration/all.yml tags: integration From 7bc2102d2b7c952cb4f09008a2dcfcf80b08a00a Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 23:46:15 +0100 Subject: [PATCH 07/19] fixed tests for ansible 2.12 --- tests/ansible/integration/all.yml | 36 +++++++++++++++---------------- tests/ansible/regression/all.yml | 30 +++++++++++++------------- tests/ansible/setup/all.yml | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index 6bd5059a..ac196584 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -3,39 +3,39 @@ # This playbook imports all tests that are known to work at present. # -- include: action/all.yml +- import_playbook: action/all.yml tags: action -- include: async/all.yml +- import_playbook: async/all.yml tags: async -- include: become/all.yml +- import_playbook: become/all.yml tags: become -- include: connection/all.yml +- import_playbook: connection/all.yml tags: connection -- include: connection_delegation/all.yml +- import_playbook: connection_delegation/all.yml tags: connection_delegation -- include: connection_loader/all.yml +- import_playbook: connection_loader/all.yml tags: connection_loader -- include: context_service/all.yml +- import_playbook: context_service/all.yml tags: context_service -- include: glibc_caches/all.yml +- import_playbook: glibc_caches/all.yml tags: glibc_caches -- include: interpreter_discovery/all.yml +- import_playbook: interpreter_discovery/all.yml tags: interpreter_discovery -- include: local/all.yml +- import_playbook: local/all.yml tags: local -- include: module_utils/all.yml +- import_playbook: module_utils/all.yml tags: module_utils -- include: playbook_semantics/all.yml +- import_playbook: playbook_semantics/all.yml tags: playbook_semantics -- include: process/all.yml +- import_playbook: process/all.yml tags: process -- include: runner/all.yml +- import_playbook: runner/all.yml tags: runner -- include: ssh/all.yml +- import_playbook: ssh/all.yml tags: ssh -- include: strategy/all.yml +- import_playbook: strategy/all.yml tags: strategy -- include: stub_connections/all.yml +- import_playbook: stub_connections/all.yml tags: stub_connections -- include: transport_config/all.yml +- import_playbook: transport_config/all.yml tags: transport_config diff --git a/tests/ansible/regression/all.yml b/tests/ansible/regression/all.yml index 06ffdf61..875d520e 100644 --- a/tests/ansible/regression/all.yml +++ b/tests/ansible/regression/all.yml @@ -1,30 +1,30 @@ -- include: issue_109__target_has_old_ansible_installed.yml +- import_playbook: issue_109__target_has_old_ansible_installed.yml tags: regression -- include: issue_113__duplicate_module_imports.yml +- import_playbook: issue_113__duplicate_module_imports.yml tags: regression -- include: issue_118__script_not_marked_exec.yml +- import_playbook: issue_118__script_not_marked_exec.yml tags: regression -- include: issue_122__environment_difference.yml +- import_playbook: issue_122__environment_difference.yml tags: regression -- include: issue_140__thread_pileup.yml +- import_playbook: issue_140__thread_pileup.yml tags: regression -- include: issue_152__local_action_wrong_interpreter.yml +- import_playbook: issue_152__local_action_wrong_interpreter.yml tags: regression -- include: issue_152__virtualenv_python_fails.yml +- import_playbook: issue_152__virtualenv_python_fails.yml tags: regression -- include: issue_154__module_state_leaks.yml +- import_playbook: issue_154__module_state_leaks.yml tags: regression -- include: issue_177__copy_module_failing.yml +- import_playbook: issue_177__copy_module_failing.yml tags: regression -- include: issue_332_ansiblemoduleerror_first_occurrence.yml +- import_playbook: issue_332_ansiblemoduleerror_first_occurrence.yml tags: regression -- include: issue_558_unarchive_failed.yml +- import_playbook: issue_558_unarchive_failed.yml tags: regression -- include: issue_590__sys_modules_crap.yml +- import_playbook: issue_590__sys_modules_crap.yml tags: regression -- include: issue_591__setuptools_cwd_crash.yml +- import_playbook: issue_591__setuptools_cwd_crash.yml tags: regression -- include: issue_615__streaming_transfer.yml +- import_playbook: issue_615__streaming_transfer.yml tags: regression -- include: issue_655__wait_for_connection_error.yml +- import_playbook: issue_655__wait_for_connection_error.yml tags: regression diff --git a/tests/ansible/setup/all.yml b/tests/ansible/setup/all.yml index c51fa295..2ca6b97c 100644 --- a/tests/ansible/setup/all.yml +++ b/tests/ansible/setup/all.yml @@ -1 +1 @@ -- include: report.yml +- import_playbook: report.yml From 2d3970552ed340a3b839d9cdc2e2da98d844a2a5 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 23:46:36 +0100 Subject: [PATCH 08/19] fixed tests for ansible 2.12 --- 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 c43d5cc7..d823e05e 100644 --- a/tests/ansible/integration/action/all.yml +++ b/tests/ansible/integration/action/all.yml @@ -1,10 +1,10 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/async/all.yml b/tests/ansible/integration/async/all.yml index f14537ed..61d2d35c 100644 --- a/tests/ansible/integration/async/all.yml +++ b/tests/ansible/integration/async/all.yml @@ -1,9 +1,9 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/become/all.yml b/tests/ansible/integration/become/all.yml index 5fa030d1..c9c331dd 100644 --- a/tests/ansible/integration/become/all.yml +++ b/tests/ansible/integration/become/all.yml @@ -1,7 +1,7 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/connection/all.yml b/tests/ansible/integration/connection/all.yml index 348857f5..b707b0eb 100644 --- a/tests/ansible/integration/connection/all.yml +++ b/tests/ansible/integration/connection/all.yml @@ -1,11 +1,11 @@ --- -- 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 +- 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 diff --git a/tests/ansible/integration/connection_delegation/all.yml b/tests/ansible/integration/connection_delegation/all.yml index c9b09687..8d5ffe03 100644 --- a/tests/ansible/integration/connection_delegation/all.yml +++ b/tests/ansible/integration/connection_delegation/all.yml @@ -1,5 +1,5 @@ -- include: delegate_to_template.yml -- include: local_action.yml -- include: osa_container_standalone.yml -- include: osa_delegate_to_self.yml -- include: stack_construction.yml +- 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 diff --git a/tests/ansible/integration/connection_loader/all.yml b/tests/ansible/integration/connection_loader/all.yml index 76ffe8f4..7a44bb2f 100644 --- a/tests/ansible/integration/connection_loader/all.yml +++ b/tests/ansible/integration/connection_loader/all.yml @@ -1,3 +1,3 @@ -- include: local_blemished.yml -- include: paramiko_unblemished.yml -- include: ssh_blemished.yml +- import_playbook: local_blemished.yml +- import_playbook: paramiko_unblemished.yml +- import_playbook: ssh_blemished.yml diff --git a/tests/ansible/integration/context_service/all.yml b/tests/ansible/integration/context_service/all.yml index 7770629a..edcf8eff 100644 --- a/tests/ansible/integration/context_service/all.yml +++ b/tests/ansible/integration/context_service/all.yml @@ -1,4 +1,4 @@ -- include: disconnect_cleanup.yml -- include: lru_one_target.yml -- include: reconnection.yml -- include: remote_name.yml +- import_playbook: disconnect_cleanup.yml +- import_playbook: lru_one_target.yml +- import_playbook: reconnection.yml +- import_playbook: remote_name.yml diff --git a/tests/ansible/integration/glibc_caches/all.yml b/tests/ansible/integration/glibc_caches/all.yml index 8cff4ea8..7d524540 100644 --- a/tests/ansible/integration/glibc_caches/all.yml +++ b/tests/ansible/integration/glibc_caches/all.yml @@ -1,2 +1,2 @@ -- include: resolv_conf.yml +- import_playbook: resolv_conf.yml diff --git a/tests/ansible/integration/interpreter_discovery/all.yml b/tests/ansible/integration/interpreter_discovery/all.yml index 403fd761..56fbc622 100644 --- a/tests/ansible/integration/interpreter_discovery/all.yml +++ b/tests/ansible/integration/interpreter_discovery/all.yml @@ -1,2 +1,2 @@ -- include: complex_args.yml -- include: ansible_2_8_tests.yml +- import_playbook: complex_args.yml +- import_playbook: ansible_2_8_tests.yml diff --git a/tests/ansible/integration/local/all.yml b/tests/ansible/integration/local/all.yml index 5f8b4dd4..383a9108 100644 --- a/tests/ansible/integration/local/all.yml +++ b/tests/ansible/integration/local/all.yml @@ -1,4 +1,4 @@ -- include: cwd_preserved.yml -- include: env_preserved.yml +- import_playbook: cwd_preserved.yml +- import_playbook: env_preserved.yml diff --git a/tests/ansible/integration/module_utils/all.yml b/tests/ansible/integration/module_utils/all.yml index b68e2ee3..c8b8f2fb 100644 --- a/tests/ansible/integration/module_utils/all.yml +++ b/tests/ansible/integration/module_utils/all.yml @@ -1,6 +1,6 @@ -#- 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 +#- 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 diff --git a/tests/ansible/integration/playbook_semantics/all.yml b/tests/ansible/integration/playbook_semantics/all.yml index ec7a9a07..6c8dd065 100644 --- a/tests/ansible/integration/playbook_semantics/all.yml +++ b/tests/ansible/integration/playbook_semantics/all.yml @@ -1,4 +1,4 @@ -- include: become_flags.yml -- include: delegate_to.yml -- include: environment.yml -- include: with_items.yml +- import_playbook: become_flags.yml +- import_playbook: delegate_to.yml +- import_playbook: environment.yml +- import_playbook: with_items.yml diff --git a/tests/ansible/integration/process/all.yml b/tests/ansible/integration/process/all.yml index a309113a..c50d6bd5 100644 --- a/tests/ansible/integration/process/all.yml +++ b/tests/ansible/integration/process/all.yml @@ -1 +1 @@ -- include: "unix_socket_cleanup.yml" +- import_playbook: "unix_socket_cleanup.yml" diff --git a/tests/ansible/integration/runner/all.yml b/tests/ansible/integration/runner/all.yml index 19586547..5de9fb27 100644 --- a/tests/ansible/integration/runner/all.yml +++ b/tests/ansible/integration/runner/all.yml @@ -1,24 +1,24 @@ -- 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 +- 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 # I hate this test. I hope it dies, it has caused nothing but misery and suffering -#- include: etc_environment.yml -- include: forking_active.yml -- include: forking_correct_parent.yml -- include: forking_inactive.yml -- include: missing_module.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 diff --git a/tests/ansible/integration/ssh/all.yml b/tests/ansible/integration/ssh/all.yml index 28495f49..a8335ab7 100644 --- a/tests/ansible/integration/ssh/all.yml +++ b/tests/ansible/integration/ssh/all.yml @@ -1,3 +1,3 @@ -- include: config.yml -- include: timeouts.yml -- include: variables.yml +- import_playbook: config.yml +- import_playbook: timeouts.yml +- import_playbook: variables.yml diff --git a/tests/ansible/integration/strategy/all.yml b/tests/ansible/integration/strategy/all.yml index b519e1bc..3304817c 100644 --- a/tests/ansible/integration/strategy/all.yml +++ b/tests/ansible/integration/strategy/all.yml @@ -1 +1 @@ -- include: mixed_vanilla_mitogen.yml +- import_playbook: mixed_vanilla_mitogen.yml diff --git a/tests/ansible/integration/stub_connections/all.yml b/tests/ansible/integration/stub_connections/all.yml index e1810138..a9744ab7 100644 --- a/tests/ansible/integration/stub_connections/all.yml +++ b/tests/ansible/integration/stub_connections/all.yml @@ -1,7 +1,7 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/transport_config/all.yml b/tests/ansible/integration/transport_config/all.yml index d4ed832f..548e7f7e 100644 --- a/tests/ansible/integration/transport_config/all.yml +++ b/tests/ansible/integration/transport_config/all.yml @@ -1,11 +1,11 @@ -- 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 +- 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 From b9782ded9c537f40c043923ea9262a98de6baf33 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Wed, 8 Dec 2021 23:47:28 +0100 Subject: [PATCH 09/19] run ansible 5 tests only w/ py39 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1820fa01..43e2537e 100644 --- a/tox.ini +++ b/tox.ini @@ -35,7 +35,8 @@ [tox] envlist = init, - py{27,36,39}-mode_ansible-ansible{2.10,3,4,5}, + py{27,36}-mode_ansible-ansible{2.10,3,4}, + py{39}-mode_ansible-ansible{2.10,3,4,5}, py{27,36,39}-mode_mitogen-distro_centos{6,7,8}, py{27,36,39}-mode_mitogen-distro_debian{9,10,11}, py{27,36,39}-mode_mitogen-distro_ubuntu{1604,1804,2004}, From 3d450f0f22bb208902d7e0eeba7b010309f041dd Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Fri, 10 Dec 2021 09:49:28 +0100 Subject: [PATCH 10/19] fix interpreter discovery tests for changed python interpreter behaviour from ansible 2.12 on --- .../ansible_2_8_tests.yml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml index 2dea4f8b..9b974c6d 100644 --- a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml +++ b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml @@ -63,15 +63,31 @@ ping: register: legacy - - name: check for dep warning (only on platforms where auto result is not /usr/bin/python and legacy is) + # from ansible 2.12 on this changed + # - https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_5.html#python-interpreter-discovery + # - https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html + # default discovery methot is now auto and will default to python3 + # and the message changed from a deprecation warning to a real warning that can not be suppressed by + # using deprecation_warnings=False + - name: check for dep warning (only on platforms where auto result is not /usr/bin/python and legacy is) for ansible 2.8-2.11 assert: that: - legacy.deprecations | default([]) | length > 0 fail_msg: legacy={{legacy}} # only check for a dep warning if legacy returned /usr/bin/python and auto didn't when: legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python' and - auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python' + auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python' and + ansible_version.full is version_compare('2.12.0', '<', strict=True) + - name: check for warning (only on platforms where auto result is not /usr/bin/python and legacy is) from ansible 2.12 on + assert: + that: + - legacy.warnings | default([]) | length > 0 + fail_msg: legacy={{legacy}} + # only check for a warning if legacy returned /usr/bin/python and auto didn't + when: legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python' and + auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python' and + ansible_version.full is version_compare('2.12.0', '>=', strict=True) - name: test that auto_silent never warns and got the same answer as auto block: From 54b9115f20172358f5a0d645fea3d70327b3302c Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 20:33:00 +0100 Subject: [PATCH 11/19] Update docs/ansible_detailed.rst fixed supported ansible / python version listing Co-authored-by: Alex Willmer --- docs/ansible_detailed.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/ansible_detailed.rst b/docs/ansible_detailed.rst index 65bcfffd..aa82ee50 100644 --- a/docs/ansible_detailed.rst +++ b/docs/ansible_detailed.rst @@ -146,7 +146,9 @@ Noteworthy Differences ---------------------- * Mitogen 0.2.x supports Ansible 2.3-2.9; with Python 2.6, 2.7, or 3.6. - Mitogen 0.3.1+ supports Ansible 2.10, 3, 4 and 5; with Python 2.7, or 3.6-3.9. + Mitogen 0.3.1+ supports + - Ansible 2.10, 3, and 4; with Python 2.7, or 3.6-3.9 + - Ansible 5; with Python 3.8-3.9 Verify your installation is running one of these versions by checking ``ansible --version`` output. From e509c1fb77e12e60cdb0b6e89b11d0e6907b2ba8 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 20:33:34 +0100 Subject: [PATCH 12/19] Update tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml Co-authored-by: Alex Willmer --- .../integration/interpreter_discovery/ansible_2_8_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml index 9b974c6d..f639779d 100644 --- a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml +++ b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml @@ -63,13 +63,13 @@ ping: register: legacy + - name: check for dep warning (only on platforms where auto result is not /usr/bin/python and legacy is) for ansible 2.8-2.11 # from ansible 2.12 on this changed # - https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_5.html#python-interpreter-discovery # - https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html - # default discovery methot is now auto and will default to python3 + # default discovery method is now auto and will default to python3 # and the message changed from a deprecation warning to a real warning that can not be suppressed by # using deprecation_warnings=False - - name: check for dep warning (only on platforms where auto result is not /usr/bin/python and legacy is) for ansible 2.8-2.11 assert: that: - legacy.deprecations | default([]) | length > 0 From 478f286efb6653194b752d42c1c94a3c625731eb Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 20:34:52 +0100 Subject: [PATCH 13/19] 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 From f82bd3d714605ddaa1b1e29d24a56d20cdc5c498 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 20:39:06 +0100 Subject: [PATCH 14/19] 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 7bc2102d2b7c952cb4f09008a2dcfcf80b08a00a. --- tests/ansible/integration/all.yml | 36 +++++++++++++++---------------- tests/ansible/regression/all.yml | 30 +++++++++++++------------- tests/ansible/setup/all.yml | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index ac196584..6bd5059a 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -3,39 +3,39 @@ # This playbook imports all tests that are known to work at present. # -- import_playbook: action/all.yml +- include: action/all.yml tags: action -- import_playbook: async/all.yml +- include: async/all.yml tags: async -- import_playbook: become/all.yml +- include: become/all.yml tags: become -- import_playbook: connection/all.yml +- include: connection/all.yml tags: connection -- import_playbook: connection_delegation/all.yml +- include: connection_delegation/all.yml tags: connection_delegation -- import_playbook: connection_loader/all.yml +- include: connection_loader/all.yml tags: connection_loader -- import_playbook: context_service/all.yml +- include: context_service/all.yml tags: context_service -- import_playbook: glibc_caches/all.yml +- include: glibc_caches/all.yml tags: glibc_caches -- import_playbook: interpreter_discovery/all.yml +- include: interpreter_discovery/all.yml tags: interpreter_discovery -- import_playbook: local/all.yml +- include: local/all.yml tags: local -- import_playbook: module_utils/all.yml +- include: module_utils/all.yml tags: module_utils -- import_playbook: playbook_semantics/all.yml +- include: playbook_semantics/all.yml tags: playbook_semantics -- import_playbook: process/all.yml +- include: process/all.yml tags: process -- import_playbook: runner/all.yml +- include: runner/all.yml tags: runner -- import_playbook: ssh/all.yml +- include: ssh/all.yml tags: ssh -- import_playbook: strategy/all.yml +- include: strategy/all.yml tags: strategy -- import_playbook: stub_connections/all.yml +- include: stub_connections/all.yml tags: stub_connections -- import_playbook: transport_config/all.yml +- include: transport_config/all.yml tags: transport_config diff --git a/tests/ansible/regression/all.yml b/tests/ansible/regression/all.yml index 875d520e..06ffdf61 100644 --- a/tests/ansible/regression/all.yml +++ b/tests/ansible/regression/all.yml @@ -1,30 +1,30 @@ -- import_playbook: issue_109__target_has_old_ansible_installed.yml +- include: issue_109__target_has_old_ansible_installed.yml tags: regression -- import_playbook: issue_113__duplicate_module_imports.yml +- include: issue_113__duplicate_module_imports.yml tags: regression -- import_playbook: issue_118__script_not_marked_exec.yml +- include: issue_118__script_not_marked_exec.yml tags: regression -- import_playbook: issue_122__environment_difference.yml +- include: issue_122__environment_difference.yml tags: regression -- import_playbook: issue_140__thread_pileup.yml +- include: issue_140__thread_pileup.yml tags: regression -- import_playbook: issue_152__local_action_wrong_interpreter.yml +- include: issue_152__local_action_wrong_interpreter.yml tags: regression -- import_playbook: issue_152__virtualenv_python_fails.yml +- include: issue_152__virtualenv_python_fails.yml tags: regression -- import_playbook: issue_154__module_state_leaks.yml +- include: issue_154__module_state_leaks.yml tags: regression -- import_playbook: issue_177__copy_module_failing.yml +- include: issue_177__copy_module_failing.yml tags: regression -- import_playbook: issue_332_ansiblemoduleerror_first_occurrence.yml +- include: issue_332_ansiblemoduleerror_first_occurrence.yml tags: regression -- import_playbook: issue_558_unarchive_failed.yml +- include: issue_558_unarchive_failed.yml tags: regression -- import_playbook: issue_590__sys_modules_crap.yml +- include: issue_590__sys_modules_crap.yml tags: regression -- import_playbook: issue_591__setuptools_cwd_crash.yml +- include: issue_591__setuptools_cwd_crash.yml tags: regression -- import_playbook: issue_615__streaming_transfer.yml +- include: issue_615__streaming_transfer.yml tags: regression -- import_playbook: issue_655__wait_for_connection_error.yml +- include: issue_655__wait_for_connection_error.yml tags: regression diff --git a/tests/ansible/setup/all.yml b/tests/ansible/setup/all.yml index 2ca6b97c..c51fa295 100644 --- a/tests/ansible/setup/all.yml +++ b/tests/ansible/setup/all.yml @@ -1 +1 @@ -- import_playbook: report.yml +- include: report.yml From ffb58cd5571e2077abb05554849b5ab10824b67d Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 20:39:50 +0100 Subject: [PATCH 15/19] 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 19c28b2b1a56dfdbf3ab838a8e3b8881a5951520. --- tests/ansible/all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ansible/all.yml b/tests/ansible/all.yml index 7a3e7000..e8bf26f2 100644 --- a/tests/ansible/all.yml +++ b/tests/ansible/all.yml @@ -1,6 +1,6 @@ -- import_playbook: setup/all.yml +- include: setup/all.yml tags: setup -- import_playbook: regression/all.yml +- include: regression/all.yml tags: regression -- import_playbook: integration/all.yml +- include: integration/all.yml tags: integration From 81f075340b55ac4bed9cc9059cbfeebc24bfdf44 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 21:57:11 +0100 Subject: [PATCH 16/19] use conditionals in list form --- .../interpreter_discovery/ansible_2_8_tests.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml index f639779d..201ef8b4 100644 --- a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml +++ b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml @@ -75,9 +75,10 @@ - legacy.deprecations | default([]) | length > 0 fail_msg: legacy={{legacy}} # only check for a dep warning if legacy returned /usr/bin/python and auto didn't - when: legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python' and - auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python' and - ansible_version.full is version_compare('2.12.0', '<', strict=True) + when: + - legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python' + - auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python' + - ansible_version.full is version_compare('2.12.0', '<', strict=True) - name: check for warning (only on platforms where auto result is not /usr/bin/python and legacy is) from ansible 2.12 on assert: @@ -85,9 +86,10 @@ - legacy.warnings | default([]) | length > 0 fail_msg: legacy={{legacy}} # only check for a warning if legacy returned /usr/bin/python and auto didn't - when: legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python' and - auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python' and - ansible_version.full is version_compare('2.12.0', '>=', strict=True) + when: + - legacy.ansible_facts.discovered_interpreter_python == '/usr/bin/python' + - auto_out.ansible_facts.discovered_interpreter_python != '/usr/bin/python' + - ansible_version.full is version_compare('2.12.0', '>=', strict=True) - name: test that auto_silent never warns and got the same answer as auto block: From b8dd348b1e0e6e7bc4a48cd4acbfc0d20b1fea45 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 22:11:38 +0100 Subject: [PATCH 17/19] Revert "Revert "fixed tests for ansible 2.12"" This reverts commit f82bd3d714605ddaa1b1e29d24a56d20cdc5c498. --- tests/ansible/integration/all.yml | 36 +++++++++++++++---------------- tests/ansible/regression/all.yml | 30 +++++++++++++------------- tests/ansible/setup/all.yml | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index 6bd5059a..ac196584 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -3,39 +3,39 @@ # This playbook imports all tests that are known to work at present. # -- include: action/all.yml +- import_playbook: action/all.yml tags: action -- include: async/all.yml +- import_playbook: async/all.yml tags: async -- include: become/all.yml +- import_playbook: become/all.yml tags: become -- include: connection/all.yml +- import_playbook: connection/all.yml tags: connection -- include: connection_delegation/all.yml +- import_playbook: connection_delegation/all.yml tags: connection_delegation -- include: connection_loader/all.yml +- import_playbook: connection_loader/all.yml tags: connection_loader -- include: context_service/all.yml +- import_playbook: context_service/all.yml tags: context_service -- include: glibc_caches/all.yml +- import_playbook: glibc_caches/all.yml tags: glibc_caches -- include: interpreter_discovery/all.yml +- import_playbook: interpreter_discovery/all.yml tags: interpreter_discovery -- include: local/all.yml +- import_playbook: local/all.yml tags: local -- include: module_utils/all.yml +- import_playbook: module_utils/all.yml tags: module_utils -- include: playbook_semantics/all.yml +- import_playbook: playbook_semantics/all.yml tags: playbook_semantics -- include: process/all.yml +- import_playbook: process/all.yml tags: process -- include: runner/all.yml +- import_playbook: runner/all.yml tags: runner -- include: ssh/all.yml +- import_playbook: ssh/all.yml tags: ssh -- include: strategy/all.yml +- import_playbook: strategy/all.yml tags: strategy -- include: stub_connections/all.yml +- import_playbook: stub_connections/all.yml tags: stub_connections -- include: transport_config/all.yml +- import_playbook: transport_config/all.yml tags: transport_config diff --git a/tests/ansible/regression/all.yml b/tests/ansible/regression/all.yml index 06ffdf61..875d520e 100644 --- a/tests/ansible/regression/all.yml +++ b/tests/ansible/regression/all.yml @@ -1,30 +1,30 @@ -- include: issue_109__target_has_old_ansible_installed.yml +- import_playbook: issue_109__target_has_old_ansible_installed.yml tags: regression -- include: issue_113__duplicate_module_imports.yml +- import_playbook: issue_113__duplicate_module_imports.yml tags: regression -- include: issue_118__script_not_marked_exec.yml +- import_playbook: issue_118__script_not_marked_exec.yml tags: regression -- include: issue_122__environment_difference.yml +- import_playbook: issue_122__environment_difference.yml tags: regression -- include: issue_140__thread_pileup.yml +- import_playbook: issue_140__thread_pileup.yml tags: regression -- include: issue_152__local_action_wrong_interpreter.yml +- import_playbook: issue_152__local_action_wrong_interpreter.yml tags: regression -- include: issue_152__virtualenv_python_fails.yml +- import_playbook: issue_152__virtualenv_python_fails.yml tags: regression -- include: issue_154__module_state_leaks.yml +- import_playbook: issue_154__module_state_leaks.yml tags: regression -- include: issue_177__copy_module_failing.yml +- import_playbook: issue_177__copy_module_failing.yml tags: regression -- include: issue_332_ansiblemoduleerror_first_occurrence.yml +- import_playbook: issue_332_ansiblemoduleerror_first_occurrence.yml tags: regression -- include: issue_558_unarchive_failed.yml +- import_playbook: issue_558_unarchive_failed.yml tags: regression -- include: issue_590__sys_modules_crap.yml +- import_playbook: issue_590__sys_modules_crap.yml tags: regression -- include: issue_591__setuptools_cwd_crash.yml +- import_playbook: issue_591__setuptools_cwd_crash.yml tags: regression -- include: issue_615__streaming_transfer.yml +- import_playbook: issue_615__streaming_transfer.yml tags: regression -- include: issue_655__wait_for_connection_error.yml +- import_playbook: issue_655__wait_for_connection_error.yml tags: regression diff --git a/tests/ansible/setup/all.yml b/tests/ansible/setup/all.yml index c51fa295..2ca6b97c 100644 --- a/tests/ansible/setup/all.yml +++ b/tests/ansible/setup/all.yml @@ -1 +1 @@ -- include: report.yml +- import_playbook: report.yml From 2b4f04c5548ee2be34a560154893f11ec0f9fef4 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 22:12:01 +0100 Subject: [PATCH 18/19] Revert "Revert "fixed tests for ansible 2.12"" This reverts commit 478f286efb6653194b752d42c1c94a3c625731eb. --- 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 c43d5cc7..d823e05e 100644 --- a/tests/ansible/integration/action/all.yml +++ b/tests/ansible/integration/action/all.yml @@ -1,10 +1,10 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/async/all.yml b/tests/ansible/integration/async/all.yml index f14537ed..61d2d35c 100644 --- a/tests/ansible/integration/async/all.yml +++ b/tests/ansible/integration/async/all.yml @@ -1,9 +1,9 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/become/all.yml b/tests/ansible/integration/become/all.yml index 5fa030d1..c9c331dd 100644 --- a/tests/ansible/integration/become/all.yml +++ b/tests/ansible/integration/become/all.yml @@ -1,7 +1,7 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/connection/all.yml b/tests/ansible/integration/connection/all.yml index 348857f5..b707b0eb 100644 --- a/tests/ansible/integration/connection/all.yml +++ b/tests/ansible/integration/connection/all.yml @@ -1,11 +1,11 @@ --- -- 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 +- 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 diff --git a/tests/ansible/integration/connection_delegation/all.yml b/tests/ansible/integration/connection_delegation/all.yml index c9b09687..8d5ffe03 100644 --- a/tests/ansible/integration/connection_delegation/all.yml +++ b/tests/ansible/integration/connection_delegation/all.yml @@ -1,5 +1,5 @@ -- include: delegate_to_template.yml -- include: local_action.yml -- include: osa_container_standalone.yml -- include: osa_delegate_to_self.yml -- include: stack_construction.yml +- 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 diff --git a/tests/ansible/integration/connection_loader/all.yml b/tests/ansible/integration/connection_loader/all.yml index 76ffe8f4..7a44bb2f 100644 --- a/tests/ansible/integration/connection_loader/all.yml +++ b/tests/ansible/integration/connection_loader/all.yml @@ -1,3 +1,3 @@ -- include: local_blemished.yml -- include: paramiko_unblemished.yml -- include: ssh_blemished.yml +- import_playbook: local_blemished.yml +- import_playbook: paramiko_unblemished.yml +- import_playbook: ssh_blemished.yml diff --git a/tests/ansible/integration/context_service/all.yml b/tests/ansible/integration/context_service/all.yml index 7770629a..edcf8eff 100644 --- a/tests/ansible/integration/context_service/all.yml +++ b/tests/ansible/integration/context_service/all.yml @@ -1,4 +1,4 @@ -- include: disconnect_cleanup.yml -- include: lru_one_target.yml -- include: reconnection.yml -- include: remote_name.yml +- import_playbook: disconnect_cleanup.yml +- import_playbook: lru_one_target.yml +- import_playbook: reconnection.yml +- import_playbook: remote_name.yml diff --git a/tests/ansible/integration/glibc_caches/all.yml b/tests/ansible/integration/glibc_caches/all.yml index 8cff4ea8..7d524540 100644 --- a/tests/ansible/integration/glibc_caches/all.yml +++ b/tests/ansible/integration/glibc_caches/all.yml @@ -1,2 +1,2 @@ -- include: resolv_conf.yml +- import_playbook: resolv_conf.yml diff --git a/tests/ansible/integration/interpreter_discovery/all.yml b/tests/ansible/integration/interpreter_discovery/all.yml index 403fd761..56fbc622 100644 --- a/tests/ansible/integration/interpreter_discovery/all.yml +++ b/tests/ansible/integration/interpreter_discovery/all.yml @@ -1,2 +1,2 @@ -- include: complex_args.yml -- include: ansible_2_8_tests.yml +- import_playbook: complex_args.yml +- import_playbook: ansible_2_8_tests.yml diff --git a/tests/ansible/integration/local/all.yml b/tests/ansible/integration/local/all.yml index 5f8b4dd4..383a9108 100644 --- a/tests/ansible/integration/local/all.yml +++ b/tests/ansible/integration/local/all.yml @@ -1,4 +1,4 @@ -- include: cwd_preserved.yml -- include: env_preserved.yml +- import_playbook: cwd_preserved.yml +- import_playbook: env_preserved.yml diff --git a/tests/ansible/integration/module_utils/all.yml b/tests/ansible/integration/module_utils/all.yml index b68e2ee3..c8b8f2fb 100644 --- a/tests/ansible/integration/module_utils/all.yml +++ b/tests/ansible/integration/module_utils/all.yml @@ -1,6 +1,6 @@ -#- 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 +#- 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 diff --git a/tests/ansible/integration/playbook_semantics/all.yml b/tests/ansible/integration/playbook_semantics/all.yml index ec7a9a07..6c8dd065 100644 --- a/tests/ansible/integration/playbook_semantics/all.yml +++ b/tests/ansible/integration/playbook_semantics/all.yml @@ -1,4 +1,4 @@ -- include: become_flags.yml -- include: delegate_to.yml -- include: environment.yml -- include: with_items.yml +- import_playbook: become_flags.yml +- import_playbook: delegate_to.yml +- import_playbook: environment.yml +- import_playbook: with_items.yml diff --git a/tests/ansible/integration/process/all.yml b/tests/ansible/integration/process/all.yml index a309113a..c50d6bd5 100644 --- a/tests/ansible/integration/process/all.yml +++ b/tests/ansible/integration/process/all.yml @@ -1 +1 @@ -- include: "unix_socket_cleanup.yml" +- import_playbook: "unix_socket_cleanup.yml" diff --git a/tests/ansible/integration/runner/all.yml b/tests/ansible/integration/runner/all.yml index 19586547..5de9fb27 100644 --- a/tests/ansible/integration/runner/all.yml +++ b/tests/ansible/integration/runner/all.yml @@ -1,24 +1,24 @@ -- 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 +- 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 # I hate this test. I hope it dies, it has caused nothing but misery and suffering -#- include: etc_environment.yml -- include: forking_active.yml -- include: forking_correct_parent.yml -- include: forking_inactive.yml -- include: missing_module.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 diff --git a/tests/ansible/integration/ssh/all.yml b/tests/ansible/integration/ssh/all.yml index 28495f49..a8335ab7 100644 --- a/tests/ansible/integration/ssh/all.yml +++ b/tests/ansible/integration/ssh/all.yml @@ -1,3 +1,3 @@ -- include: config.yml -- include: timeouts.yml -- include: variables.yml +- import_playbook: config.yml +- import_playbook: timeouts.yml +- import_playbook: variables.yml diff --git a/tests/ansible/integration/strategy/all.yml b/tests/ansible/integration/strategy/all.yml index b519e1bc..3304817c 100644 --- a/tests/ansible/integration/strategy/all.yml +++ b/tests/ansible/integration/strategy/all.yml @@ -1 +1 @@ -- include: mixed_vanilla_mitogen.yml +- import_playbook: mixed_vanilla_mitogen.yml diff --git a/tests/ansible/integration/stub_connections/all.yml b/tests/ansible/integration/stub_connections/all.yml index e1810138..a9744ab7 100644 --- a/tests/ansible/integration/stub_connections/all.yml +++ b/tests/ansible/integration/stub_connections/all.yml @@ -1,7 +1,7 @@ -- 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 +- 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 diff --git a/tests/ansible/integration/transport_config/all.yml b/tests/ansible/integration/transport_config/all.yml index d4ed832f..548e7f7e 100644 --- a/tests/ansible/integration/transport_config/all.yml +++ b/tests/ansible/integration/transport_config/all.yml @@ -1,11 +1,11 @@ -- 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 +- 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 From f1fde91984753ab1eb23160f14f964b1b0e90f78 Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Sun, 12 Dec 2021 22:13:03 +0100 Subject: [PATCH 19/19] Revert "Revert "fixed tests for ansible 2.12"" This reverts commit ffb58cd5571e2077abb05554849b5ab10824b67d. --- tests/ansible/all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ansible/all.yml b/tests/ansible/all.yml index e8bf26f2..7a3e7000 100644 --- a/tests/ansible/all.yml +++ b/tests/ansible/all.yml @@ -1,6 +1,6 @@ -- include: setup/all.yml +- import_playbook: setup/all.yml tags: setup -- include: regression/all.yml +- import_playbook: regression/all.yml tags: regression -- include: integration/all.yml +- import_playbook: integration/all.yml tags: integration