From 0af057e365053b0ad4d937d910512e073ac8baae Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Fri, 12 Nov 2021 23:28:16 +0000 Subject: [PATCH] ci: Convert host group names from kebab-case to snake_case Ansible 2.* and higher emit warnings about snake case, and it may be causing tests to get skipped or behave differently. --- .ci/ansible_tests.py | 2 +- tests/ansible/bench/file_transfer.yml | 2 +- tests/ansible/bench/includes.yml | 2 +- .../ansible/hosts/connection_delegation.hosts | 4 ++-- tests/ansible/hosts/default.hosts | 2 +- ...-containers.yml => osa_all_containers.yml} | 0 tests/ansible/hosts/k3.hosts | 16 +++++++-------- tests/ansible/hosts/localhost.hosts | 20 +++++++++---------- tests/ansible/hosts/osa-containers | 2 +- tests/ansible/integration/action/copy.yml | 2 +- .../integration/action/fixup_perms2__copy.yml | 2 +- .../action/low_level_execute_command.yml | 2 +- .../integration/action/make_tmp_path.yml | 2 +- .../integration/action/remote_expand_user.yml | 2 +- .../integration/action/remote_file_exists.yml | 2 +- .../integration/action/remove_tmp_path.yml | 2 +- .../integration/action/synchronize.yml | 2 +- .../integration/action/transfer_data.yml | 2 +- .../integration/async/multiple_items_loop.yml | 2 +- .../async/result_binary_producing_json.yml | 2 +- .../async/result_binary_producing_junk.yml | 2 +- .../async/result_shell_echo_hi.yml | 2 +- .../integration/async/runner_new_process.yml | 2 +- .../integration/async/runner_one_job.yml | 2 +- .../async/runner_timeout_then_polling.yml | 2 +- .../async/runner_two_simultaneous_jobs.yml | 2 +- .../async/runner_with_polling_and_timeout.yml | 2 +- .../integration/become/su_password.yml | 2 +- .../integration/become/sudo_flags_failure.yml | 2 +- .../integration/become/sudo_nonexistent.yml | 2 +- .../integration/become/sudo_nopassword.yml | 2 +- .../integration/become/sudo_password.yml | 2 +- .../integration/become/sudo_requiretty.yml | 2 +- .../connection/_disconnect_during_module.yml | 2 +- .../connection/disconnect_during_module.yml | 2 +- .../disconnect_resets_connection.yml | 2 +- .../integration/connection/exec_command.yml | 2 +- .../integration/connection/home_dir.yml | 2 +- .../integration/connection/put_large_file.yml | 2 +- .../integration/connection/put_small_file.yml | 2 +- .../ansible/integration/connection/reset.yml | 2 +- .../integration/connection/reset_become.yml | 2 +- .../delegate_to_template.yml | 4 ++-- .../connection_loader/local_blemished.yml | 2 +- .../paramiko_unblemished.yml | 2 +- .../connection_loader/ssh_blemished.yml | 2 +- .../context_service/disconnect_cleanup.yml | 2 +- .../context_service/lru_one_target.yml | 2 +- .../context_service/reconnection.yml | 2 +- .../context_service/remote_name.yml | 2 +- .../integration/glibc_caches/resolv_conf.yml | 2 +- .../ansible_2_8_tests.yml | 2 +- .../interpreter_discovery/complex_args.yml | 2 +- .../integration/local/cwd_preserved.yml | 2 +- .../module_utils/adjacent_to_playbook.yml | 2 +- .../module_utils/adjacent_to_role.yml | 2 +- .../module_utils/from_config_path.yml | 2 +- .../module_utils/from_config_path_pkg.yml | 2 +- .../module_utils/overrides_builtin.yml | 2 +- .../playbook_semantics/become_flags.yml | 4 ++-- .../playbook_semantics/delegate_to.yml | 2 +- .../playbook_semantics/environment.yml | 2 +- .../playbook_semantics/with_items.yml | 2 +- .../process/unix_socket_cleanup.yml | 4 ++-- tests/ansible/integration/runner/atexit.yml | 2 +- .../runner/builtin_command_module.yml | 2 +- .../runner/crashy_new_style_module.yml | 2 +- .../runner/custom_bash_hashbang_argument.yml | 2 +- .../runner/custom_bash_old_style_module.yml | 2 +- .../runner/custom_bash_want_json_module.yml | 2 +- .../runner/custom_binary_producing_json.yml | 2 +- .../runner/custom_binary_producing_junk.yml | 4 ++-- .../runner/custom_binary_single_null.yml | 4 ++-- .../runner/custom_perl_json_args_module.yml | 2 +- .../runner/custom_perl_want_json_module.yml | 2 +- .../runner/custom_python_json_args_module.yml | 2 +- ...m_python_new_style_missing_interpreter.yml | 2 +- .../runner/custom_python_new_style_module.yml | 2 +- .../custom_python_prehistoric_module.yml | 2 +- .../runner/custom_python_want_json_module.yml | 2 +- .../runner/custom_script_interpreter.yml | 2 +- .../runner/environment_isolation.yml | 2 +- .../integration/runner/etc_environment.yml | 2 +- .../integration/runner/forking_active.yml | 2 +- .../runner/forking_correct_parent.yml | 2 +- .../integration/runner/forking_inactive.yml | 2 +- .../integration/runner/missing_module.yml | 4 ++-- tests/ansible/integration/ssh/config.yml | 2 +- tests/ansible/integration/ssh/timeouts.yml | 4 ++-- tests/ansible/integration/ssh/variables.yml | 18 ++++++++--------- .../strategy/_mixed_mitogen_vanilla.yml | 6 +++--- .../strategy/_mixed_vanilla_mitogen.yml | 6 +++--- .../strategy/mixed_vanilla_mitogen.yml | 2 +- .../integration/stub_connections/kubectl.yml | 2 +- .../integration/stub_connections/lxc.yml | 2 +- .../integration/stub_connections/lxd.yml | 2 +- .../stub_connections/mitogen_doas.yml | 2 +- .../stub_connections/mitogen_sudo.yml | 2 +- .../stub_connections/setns_lxc.yml | 2 +- .../stub_connections/setns_lxd.yml | 2 +- ..._109__target_has_old_ansible_installed.yml | 2 +- .../issue_113__duplicate_module_imports.yml | 2 +- .../issue_118__script_not_marked_exec.yml | 2 +- .../issue_122__environment_difference.yml | 2 +- .../regression/issue_140__thread_pileup.yml | 2 +- ...ue_152__local_action_wrong_interpreter.yml | 2 +- .../issue_152__virtualenv_python_fails.yml | 2 +- .../issue_154__module_state_leaks.yml | 2 +- .../issue_177__copy_module_failing.yml | 2 +- ...32_ansiblemoduleerror_first_occurrence.yml | 2 +- .../regression/issue_558_unarchive_failed.yml | 2 +- .../issue_590__sys_modules_crap.yml | 2 +- .../issue_591__setuptools_cwd_crash.yml | 2 +- tests/ansible/setup/report.yml | 2 +- 114 files changed, 149 insertions(+), 149 deletions(-) rename tests/ansible/hosts/group_vars/{osa-all-containers.yml => osa_all_containers.yml} (100%) diff --git a/.ci/ansible_tests.py b/.ci/ansible_tests.py index 665e2c60..6a3fb386 100755 --- a/.ci/ansible_tests.py +++ b/.ci/ansible_tests.py @@ -47,7 +47,7 @@ with ci_lib.Fold('job_setup'): inventory_path = os.path.join(HOSTS_DIR, 'target') with open(inventory_path, 'w') as fp: - fp.write('[test-targets]\n') + fp.write('[test_targets]\n') fp.writelines( "%(name)s " "ansible_host=%(hostname)s " diff --git a/tests/ansible/bench/file_transfer.yml b/tests/ansible/bench/file_transfer.yml index f6702f58..e5d220ed 100644 --- a/tests/ansible/bench/file_transfer.yml +++ b/tests/ansible/bench/file_transfer.yml @@ -1,6 +1,6 @@ - name: bench/file_transfer.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/bench/includes.yml b/tests/ansible/bench/includes.yml index 96079874..8d6f884d 100644 --- a/tests/ansible/bench/includes.yml +++ b/tests/ansible/bench/includes.yml @@ -1,4 +1,4 @@ -- hosts: test-targets +- hosts: test_targets tasks: - include_tasks: _includes.yml with_sequence: start=1 end=1000 diff --git a/tests/ansible/hosts/connection_delegation.hosts b/tests/ansible/hosts/connection_delegation.hosts index a22bd5df..86d8e344 100644 --- a/tests/ansible/hosts/connection_delegation.hosts +++ b/tests/ansible/hosts/connection_delegation.hosts @@ -23,14 +23,14 @@ cd-newuser-normal-normal mitogen_via=cd-normal ansible_user=newuser-normal-norma cd-newuser-doas-normal mitogen_via=cd-normal ansible_connection=mitogen_doas ansible_user=newuser-doas-normal-user -[connection-delegation-test] +[connection_delegation_test] cd-bastion cd-rack11 mitogen_via=ssh-user@cd-bastion cd-rack11a mitogen_via=root@cd-rack11 cd-rack11a-docker mitogen_via=docker-admin@cd-rack11a ansible_connection=docker -[connection-delegation-cycle] +[connection_delegation_cycle] # Create cycle with Docker container. cdc-bastion mitogen_via=cdc-rack11a-docker cdc-rack11 mitogen_via=ssh-user@cdc-bastion diff --git a/tests/ansible/hosts/default.hosts b/tests/ansible/hosts/default.hosts index d40c3dd0..4f4685ef 100644 --- a/tests/ansible/hosts/default.hosts +++ b/tests/ansible/hosts/default.hosts @@ -5,5 +5,5 @@ # fixed ansible.cfg remote_user setting to test against. target ansible_host=localhost ansible_user="{{lookup('env', 'USER')}}" -[test-targets] +[test_targets] target diff --git a/tests/ansible/hosts/group_vars/osa-all-containers.yml b/tests/ansible/hosts/group_vars/osa_all_containers.yml similarity index 100% rename from tests/ansible/hosts/group_vars/osa-all-containers.yml rename to tests/ansible/hosts/group_vars/osa_all_containers.yml diff --git a/tests/ansible/hosts/k3.hosts b/tests/ansible/hosts/k3.hosts index 34e1ff95..2829def2 100644 --- a/tests/ansible/hosts/k3.hosts +++ b/tests/ansible/hosts/k3.hosts @@ -3,26 +3,26 @@ # Used for manual testing. k3 -[k3-x10] +[k3_x10] k3-[01:10] -[k3-x20] +[k3_x20] k3-[01:20] -[k3-x50] +[k3_x50] k3-[01:50] -[k3-x100] +[k3_x100] k3-[001:100] -[k3-x200] +[k3_x200] k3-[001:200] -[k3-x300] +[k3_x300] k3-[001:300] -[k3-x400] +[k3_x400] k3-[001:400] -[k3-x500] +[k3_x500] k3-[001:500] diff --git a/tests/ansible/hosts/localhost.hosts b/tests/ansible/hosts/localhost.hosts index 41af412e..a22a65da 100644 --- a/tests/ansible/hosts/localhost.hosts +++ b/tests/ansible/hosts/localhost.hosts @@ -5,32 +5,32 @@ # behaviour. # This is only used for manual testing. -[localhost-x10] +[localhost_x10] localhost-[001:010] -[localhost-x20] +[localhost_x20] localhost-[001:020] -[localhost-x30] +[localhost_x30] localhost-[001:030] -[localhost-x40] +[localhost_x40] localhost-[001:040] -[localhost-x50] +[localhost_x50] localhost-[001:050] -[localhost-x60] +[localhost_x60] localhost-[001:060] -[localhost-x70] +[localhost_x70] localhost-[001:070] -[localhost-x80] +[localhost_x80] localhost-[001:080] -[localhost-x90] +[localhost_x90] localhost-[001:090] -[localhost-x100] +[localhost_x100] localhost-[001:100] diff --git a/tests/ansible/hosts/osa-containers b/tests/ansible/hosts/osa-containers index 7ff2c2b6..f9ace11b 100644 --- a/tests/ansible/hosts/osa-containers +++ b/tests/ansible/hosts/osa-containers @@ -3,7 +3,7 @@ # Patterned after openstack-ansible/all_containers.yml osa-host-machine ansible_host=172.29.236.100 -[osa-all-containers] +[osa_all_containers] osa-container-1 container_tech=lxc osa-container-2 container_tech=lxc osa-container-3 container_tech=lxc diff --git a/tests/ansible/integration/action/copy.yml b/tests/ansible/integration/action/copy.yml index 611ff3f2..f6d8e1cf 100644 --- a/tests/ansible/integration/action/copy.yml +++ b/tests/ansible/integration/action/copy.yml @@ -1,7 +1,7 @@ # Verify copy module for small and large files, and inline content. - name: integration/action/copy.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - copy: diff --git a/tests/ansible/integration/action/fixup_perms2__copy.yml b/tests/ansible/integration/action/fixup_perms2__copy.yml index 1ba19e6f..30ec29e8 100644 --- a/tests/ansible/integration/action/fixup_perms2__copy.yml +++ b/tests/ansible/integration/action/fixup_perms2__copy.yml @@ -4,7 +4,7 @@ # regardless, we're testing that no execute bit is set here so either check is ok - name: integration/action/fixup_perms2__copy.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: # diff --git a/tests/ansible/integration/action/low_level_execute_command.yml b/tests/ansible/integration/action/low_level_execute_command.yml index 7f91bdf8..7acd4205 100644 --- a/tests/ansible/integration/action/low_level_execute_command.yml +++ b/tests/ansible/integration/action/low_level_execute_command.yml @@ -1,7 +1,7 @@ # Verify the behaviour of _low_level_execute_command(). - name: integration/action/low_level_execute_command.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/action/make_tmp_path.yml b/tests/ansible/integration/action/make_tmp_path.yml index bfebeffd..2357af33 100644 --- a/tests/ansible/integration/action/make_tmp_path.yml +++ b/tests/ansible/integration/action/make_tmp_path.yml @@ -8,7 +8,7 @@ # https://github.com/dw/mitogen/issues/301 - name: integration/action/make_tmp_path.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - meta: end_play diff --git a/tests/ansible/integration/action/remote_expand_user.yml b/tests/ansible/integration/action/remote_expand_user.yml index 8e31f657..1f40b113 100644 --- a/tests/ansible/integration/action/remote_expand_user.yml +++ b/tests/ansible/integration/action/remote_expand_user.yml @@ -2,7 +2,7 @@ # $HOME expansion. - name: integration/action/remote_expand_user.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - name: "Find out root's homedir." diff --git a/tests/ansible/integration/action/remote_file_exists.yml b/tests/ansible/integration/action/remote_file_exists.yml index 2d206930..7b616b43 100644 --- a/tests/ansible/integration/action/remote_file_exists.yml +++ b/tests/ansible/integration/action/remote_file_exists.yml @@ -1,6 +1,6 @@ - name: integration/action/remote_file_exists.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/action/remove_tmp_path.yml b/tests/ansible/integration/action/remove_tmp_path.yml index 19ae22e3..91f09b7d 100644 --- a/tests/ansible/integration/action/remove_tmp_path.yml +++ b/tests/ansible/integration/action/remove_tmp_path.yml @@ -3,7 +3,7 @@ # # - name: integration/action/remove_tmp_path.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: # diff --git a/tests/ansible/integration/action/synchronize.yml b/tests/ansible/integration/action/synchronize.yml index a6cd277e..6423608b 100644 --- a/tests/ansible/integration/action/synchronize.yml +++ b/tests/ansible/integration/action/synchronize.yml @@ -1,7 +1,7 @@ # Verify basic operation of the synchronize module. - name: integration/action/synchronize.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true vars: ansible_user: mitogen__has_sudo_pubkey diff --git a/tests/ansible/integration/action/transfer_data.yml b/tests/ansible/integration/action/transfer_data.yml index e0f42d0e..67a613c5 100644 --- a/tests/ansible/integration/action/transfer_data.yml +++ b/tests/ansible/integration/action/transfer_data.yml @@ -1,6 +1,6 @@ - name: integration/action/transfer_data.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/multiple_items_loop.yml b/tests/ansible/integration/async/multiple_items_loop.yml index 24d43083..89f3dd60 100644 --- a/tests/ansible/integration/async/multiple_items_loop.yml +++ b/tests/ansible/integration/async/multiple_items_loop.yml @@ -1,7 +1,7 @@ # issue #414: verify behaviour of async tasks created in a loop. - name: integration/async/multiple_items_loop.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/result_binary_producing_json.yml b/tests/ansible/integration/async/result_binary_producing_json.yml index b05b24bf..d1b8b22b 100644 --- a/tests/ansible/integration/async/result_binary_producing_json.yml +++ b/tests/ansible/integration/async/result_binary_producing_json.yml @@ -1,7 +1,7 @@ - name: integration/async/result_binary_producing_json.yml gather_facts: true - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/result_binary_producing_junk.yml b/tests/ansible/integration/async/result_binary_producing_junk.yml index afdf0c2f..69209efc 100644 --- a/tests/ansible/integration/async/result_binary_producing_junk.yml +++ b/tests/ansible/integration/async/result_binary_producing_junk.yml @@ -1,7 +1,7 @@ - name: integration/async/result_binary_producing_junk.yml gather_facts: true - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/result_shell_echo_hi.yml b/tests/ansible/integration/async/result_shell_echo_hi.yml index c0cb283c..7e172702 100644 --- a/tests/ansible/integration/async/result_shell_echo_hi.yml +++ b/tests/ansible/integration/async/result_shell_echo_hi.yml @@ -1,7 +1,7 @@ - name: integration/async/result_shell_echo_hi.yml gather_facts: true - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/runner_new_process.yml b/tests/ansible/integration/async/runner_new_process.yml index fbc7261f..71740096 100644 --- a/tests/ansible/integration/async/runner_new_process.yml +++ b/tests/ansible/integration/async/runner_new_process.yml @@ -1,7 +1,7 @@ # Verify async jobs run in a new process. - name: integration/async/runner_new_process.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/runner_one_job.yml b/tests/ansible/integration/async/runner_one_job.yml index cf33ae56..e9f7f63e 100644 --- a/tests/ansible/integration/async/runner_one_job.yml +++ b/tests/ansible/integration/async/runner_one_job.yml @@ -2,7 +2,7 @@ # fields. - name: integration/async/runner_one_job.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/runner_timeout_then_polling.yml b/tests/ansible/integration/async/runner_timeout_then_polling.yml index 6fc46ba7..b6049713 100644 --- a/tests/ansible/integration/async/runner_timeout_then_polling.yml +++ b/tests/ansible/integration/async/runner_timeout_then_polling.yml @@ -1,7 +1,7 @@ # Verify 'async: ' functions as desired. - name: integration/async/runner_timeout_then_polling.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml index af102f19..e7fc5bc7 100644 --- a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml +++ b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml @@ -1,6 +1,6 @@ - name: integration/async/runner_two_simultaneous_jobs.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/async/runner_with_polling_and_timeout.yml b/tests/ansible/integration/async/runner_with_polling_and_timeout.yml index a5cbabef..6d9b998b 100644 --- a/tests/ansible/integration/async/runner_with_polling_and_timeout.yml +++ b/tests/ansible/integration/async/runner_with_polling_and_timeout.yml @@ -1,7 +1,7 @@ # Verify 'async: ' functions as desired. - name: integration/async/runner_with_polling_and_timeout.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/become/su_password.yml b/tests/ansible/integration/become/su_password.yml index 7bd6db5a..f9390100 100644 --- a/tests/ansible/integration/become/su_password.yml +++ b/tests/ansible/integration/become/su_password.yml @@ -2,7 +2,7 @@ # Ansible can't handle this on OS X. I don't care why. - name: integration/become/su_password.yml - hosts: test-targets + hosts: test_targets become_method: su any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/become/sudo_flags_failure.yml b/tests/ansible/integration/become/sudo_flags_failure.yml index fdbb712c..f3e03f45 100644 --- a/tests/ansible/integration/become/sudo_flags_failure.yml +++ b/tests/ansible/integration/become/sudo_flags_failure.yml @@ -1,5 +1,5 @@ - name: integration/become/sudo_flags_failure.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/become/sudo_nonexistent.yml b/tests/ansible/integration/become/sudo_nonexistent.yml index bc3de7b8..cec494ba 100644 --- a/tests/ansible/integration/become/sudo_nonexistent.yml +++ b/tests/ansible/integration/become/sudo_nonexistent.yml @@ -1,5 +1,5 @@ - name: integration/become/sudo_nonexistent.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/become/sudo_nopassword.yml b/tests/ansible/integration/become/sudo_nopassword.yml index 110c95b4..b9738699 100644 --- a/tests/ansible/integration/become/sudo_nopassword.yml +++ b/tests/ansible/integration/become/sudo_nopassword.yml @@ -1,7 +1,7 @@ # Verify passwordless sudo behaviour in various cases. - name: integration/become/sudo_nopassword.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/become/sudo_password.yml b/tests/ansible/integration/become/sudo_password.yml index a0a1dec9..6e81449f 100644 --- a/tests/ansible/integration/become/sudo_password.yml +++ b/tests/ansible/integration/become/sudo_password.yml @@ -1,7 +1,7 @@ # Verify passwordful sudo behaviour - name: integration/become/sudo_password.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/become/sudo_requiretty.yml b/tests/ansible/integration/become/sudo_requiretty.yml index 0bdfaa26..4972a139 100644 --- a/tests/ansible/integration/become/sudo_requiretty.yml +++ b/tests/ansible/integration/become/sudo_requiretty.yml @@ -1,7 +1,7 @@ # Verify requiretty support - name: integration/become/sudo_requiretty.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/connection/_disconnect_during_module.yml b/tests/ansible/integration/connection/_disconnect_during_module.yml index 6bd8cd50..4675abb1 100644 --- a/tests/ansible/integration/connection/_disconnect_during_module.yml +++ b/tests/ansible/integration/connection/_disconnect_during_module.yml @@ -2,7 +2,7 @@ --- - name: integration/connection/_disconnect_during_module.yml - hosts: test-targets + hosts: test_targets gather_facts: no any_errors_fatal: false tasks: diff --git a/tests/ansible/integration/connection/disconnect_during_module.yml b/tests/ansible/integration/connection/disconnect_during_module.yml index 1c7b544a..a0950506 100644 --- a/tests/ansible/integration/connection/disconnect_during_module.yml +++ b/tests/ansible/integration/connection/disconnect_during_module.yml @@ -2,7 +2,7 @@ --- - name: integration/connection/disconnect_during_module.yml - hosts: test-targets + hosts: test_targets gather_facts: no any_errors_fatal: false tasks: diff --git a/tests/ansible/integration/connection/disconnect_resets_connection.yml b/tests/ansible/integration/connection/disconnect_resets_connection.yml index 3a6f712a..ffb48c00 100644 --- a/tests/ansible/integration/connection/disconnect_resets_connection.yml +++ b/tests/ansible/integration/connection/disconnect_resets_connection.yml @@ -10,7 +10,7 @@ --- - name: integration/connection/disconnect_resets_connection.yml - hosts: test-targets + hosts: test_targets gather_facts: no any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/connection/exec_command.yml b/tests/ansible/integration/connection/exec_command.yml index 125def1b..71427676 100644 --- a/tests/ansible/integration/connection/exec_command.yml +++ b/tests/ansible/integration/connection/exec_command.yml @@ -2,7 +2,7 @@ --- - name: integration/connection/exec_command.yml - hosts: test-targets + hosts: test_targets gather_facts: no any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/connection/home_dir.yml b/tests/ansible/integration/connection/home_dir.yml index 1dbaa5d3..6f4ae319 100644 --- a/tests/ansible/integration/connection/home_dir.yml +++ b/tests/ansible/integration/connection/home_dir.yml @@ -1,7 +1,7 @@ # Verify the value of the Connection.homedir attribute is as expected. - name: integration/connection/home_dir.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - name: "Find out root's homedir." diff --git a/tests/ansible/integration/connection/put_large_file.yml b/tests/ansible/integration/connection/put_large_file.yml index 90a13999..eb3acbc7 100644 --- a/tests/ansible/integration/connection/put_large_file.yml +++ b/tests/ansible/integration/connection/put_large_file.yml @@ -2,7 +2,7 @@ --- - name: integration/connection/put_large_file.yml - hosts: test-targets + hosts: test_targets gather_facts: no any_errors_fatal: true vars: diff --git a/tests/ansible/integration/connection/put_small_file.yml b/tests/ansible/integration/connection/put_small_file.yml index 49be87a9..0a86742f 100644 --- a/tests/ansible/integration/connection/put_small_file.yml +++ b/tests/ansible/integration/connection/put_small_file.yml @@ -2,7 +2,7 @@ --- - name: integration/connection/put_small_file.yml - hosts: test-targets + hosts: test_targets gather_facts: no any_errors_fatal: true vars: diff --git a/tests/ansible/integration/connection/reset.yml b/tests/ansible/integration/connection/reset.yml index ccad928e..9d2b6430 100644 --- a/tests/ansible/integration/connection/reset.yml +++ b/tests/ansible/integration/connection/reset.yml @@ -4,7 +4,7 @@ --- - name: integration/connection/reset.yml - hosts: test-targets + hosts: test_targets tasks: - meta: end_play when: not is_mitogen diff --git a/tests/ansible/integration/connection/reset_become.yml b/tests/ansible/integration/connection/reset_become.yml index fe29dfed..568687f8 100644 --- a/tests/ansible/integration/connection/reset_become.yml +++ b/tests/ansible/integration/connection/reset_become.yml @@ -1,7 +1,7 @@ # issue #633: Connection.reset() should ignore "become", and apply to the login # account. -- hosts: test-targets +- hosts: test_targets become: true gather_facts: false tasks: diff --git a/tests/ansible/integration/connection_delegation/delegate_to_template.yml b/tests/ansible/integration/connection_delegation/delegate_to_template.yml index 8e048fa4..cbdf2816 100644 --- a/tests/ansible/integration/connection_delegation/delegate_to_template.yml +++ b/tests/ansible/integration/connection_delegation/delegate_to_template.yml @@ -1,6 +1,6 @@ # issue #340: Ensure templated delegate_to field works. # -# Here we delegate from "test-targets" group to a templated "{{physical_host}}" +# Here we delegate from "test_targets" group to a templated "{{physical_host}}" # variable, which contains "cd-normal-alias", which has a # "mitogen_via=cd-alias", which in turn has an "ansible_host="alias-host". # @@ -12,7 +12,7 @@ vars: physical_host: "cd-normal-alias" physical_hosts: ["cd-normal-alias", "cd-normal-normal"] - hosts: test-targets + hosts: test_targets gather_facts: no any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/connection_loader/local_blemished.yml b/tests/ansible/integration/connection_loader/local_blemished.yml index 85224dbf..fba8166d 100644 --- a/tests/ansible/integration/connection_loader/local_blemished.yml +++ b/tests/ansible/integration/connection_loader/local_blemished.yml @@ -1,7 +1,7 @@ # Ensure 'local' connections are grabbed. - name: integration/connection_loader/local_blemished.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - determine_strategy: diff --git a/tests/ansible/integration/connection_loader/paramiko_unblemished.yml b/tests/ansible/integration/connection_loader/paramiko_unblemished.yml index 1bc5e2f6..0527575f 100644 --- a/tests/ansible/integration/connection_loader/paramiko_unblemished.yml +++ b/tests/ansible/integration/connection_loader/paramiko_unblemished.yml @@ -2,7 +2,7 @@ --- - name: integration/connection_loader/paramiko_unblemished.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - debug: diff --git a/tests/ansible/integration/connection_loader/ssh_blemished.yml b/tests/ansible/integration/connection_loader/ssh_blemished.yml index 58d35cee..45339032 100644 --- a/tests/ansible/integration/connection_loader/ssh_blemished.yml +++ b/tests/ansible/integration/connection_loader/ssh_blemished.yml @@ -1,7 +1,7 @@ # Ensure 'ssh' connections are grabbed. - name: integration/connection_loader__ssh_blemished.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - determine_strategy: diff --git a/tests/ansible/integration/context_service/disconnect_cleanup.yml b/tests/ansible/integration/context_service/disconnect_cleanup.yml index 4f846535..7356aab1 100644 --- a/tests/ansible/integration/context_service/disconnect_cleanup.yml +++ b/tests/ansible/integration/context_service/disconnect_cleanup.yml @@ -2,7 +2,7 @@ # state of dependent contexts (e.g. sudo, connection delegation, ..). - name: integration/context_service/disconnect_cleanup.yml - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true tasks: - meta: end_play diff --git a/tests/ansible/integration/context_service/lru_one_target.yml b/tests/ansible/integration/context_service/lru_one_target.yml index 2d6dc6cf..d34f8302 100644 --- a/tests/ansible/integration/context_service/lru_one_target.yml +++ b/tests/ansible/integration/context_service/lru_one_target.yml @@ -1,7 +1,7 @@ # Verify a maximum number of contexts are possible on one machine. - name: integration/context_service/lru_one_target.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true vars: max_interps: "{{lookup('env', 'MITOGEN_MAX_INTERPRETERS')}}" diff --git a/tests/ansible/integration/context_service/reconnection.yml b/tests/ansible/integration/context_service/reconnection.yml index 2d7dbacf..2a51355c 100644 --- a/tests/ansible/integration/context_service/reconnection.yml +++ b/tests/ansible/integration/context_service/reconnection.yml @@ -2,7 +2,7 @@ # cleanup of dependent (via=) contexts. - name: integration/context_service/reconnection.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - mitogen_shutdown_all: diff --git a/tests/ansible/integration/context_service/remote_name.yml b/tests/ansible/integration/context_service/remote_name.yml index cce209e4..4ef975a7 100644 --- a/tests/ansible/integration/context_service/remote_name.yml +++ b/tests/ansible/integration/context_service/remote_name.yml @@ -1,7 +1,7 @@ # issue #581: ensure mitogen_mask_remote_name is respected. - name: integration/context_service/remote_name.yml - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true tasks: - meta: end_play diff --git a/tests/ansible/integration/glibc_caches/resolv_conf.yml b/tests/ansible/integration/glibc_caches/resolv_conf.yml index e2894e58..e9bbddb5 100644 --- a/tests/ansible/integration/glibc_caches/resolv_conf.yml +++ b/tests/ansible/integration/glibc_caches/resolv_conf.yml @@ -4,7 +4,7 @@ - name: integration/glibc_caches/resolv_conf.yml gather_facts: true become: true - hosts: test-targets + hosts: test_targets vars: ansible_become_pass: has_sudo_pubkey_password tasks: 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 838b2d86..f3ed4ae9 100644 --- a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml +++ b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml @@ -2,7 +2,7 @@ --- - name: integration/interpreter_discovery/ansible_2_8_tests.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true gather_facts: true tasks: diff --git a/tests/ansible/integration/interpreter_discovery/complex_args.yml b/tests/ansible/integration/interpreter_discovery/complex_args.yml index ca35a402..b52ce304 100644 --- a/tests/ansible/integration/interpreter_discovery/complex_args.yml +++ b/tests/ansible/integration/interpreter_discovery/complex_args.yml @@ -2,7 +2,7 @@ --- - name: integration/interpreter_discovery/complex_args.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true gather_facts: true tasks: diff --git a/tests/ansible/integration/local/cwd_preserved.yml b/tests/ansible/integration/local/cwd_preserved.yml index 24a34ba8..1b00cba3 100644 --- a/tests/ansible/integration/local/cwd_preserved.yml +++ b/tests/ansible/integration/local/cwd_preserved.yml @@ -6,7 +6,7 @@ - name: integration/local/cwd_preserved.yml any_errors_fatal: true - hosts: test-targets + hosts: test_targets tasks: - connection: local command: pwd diff --git a/tests/ansible/integration/module_utils/adjacent_to_playbook.yml b/tests/ansible/integration/module_utils/adjacent_to_playbook.yml index edd65db7..745a2807 100644 --- a/tests/ansible/integration/module_utils/adjacent_to_playbook.yml +++ b/tests/ansible/integration/module_utils/adjacent_to_playbook.yml @@ -2,7 +2,7 @@ # external1 is loaded from integration/module_utils/module_utils/.. - name: integration/module_utils/adjacent_to_playbook.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/module_utils/adjacent_to_role.yml b/tests/ansible/integration/module_utils/adjacent_to_role.yml index 4430c2d9..15fe6ec6 100644 --- a/tests/ansible/integration/module_utils/adjacent_to_role.yml +++ b/tests/ansible/integration/module_utils/adjacent_to_role.yml @@ -2,7 +2,7 @@ # external1 is loaded from integration/module_utils/roles/modrole/module_utils/.. - name: integration/module_utils/adjacent_to_playbook.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true roles: - modrole diff --git a/tests/ansible/integration/module_utils/from_config_path.yml b/tests/ansible/integration/module_utils/from_config_path.yml index 0fb0f3ea..5ce9e409 100644 --- a/tests/ansible/integration/module_utils/from_config_path.yml +++ b/tests/ansible/integration/module_utils/from_config_path.yml @@ -1,7 +1,7 @@ # external1 and external2 are loaded from config path. - name: integration/module_utils/from_config_path.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/module_utils/from_config_path_pkg.yml b/tests/ansible/integration/module_utils/from_config_path_pkg.yml index 3453cf29..209ab608 100644 --- a/tests/ansible/integration/module_utils/from_config_path_pkg.yml +++ b/tests/ansible/integration/module_utils/from_config_path_pkg.yml @@ -1,7 +1,7 @@ # external1 and external2 are loaded from config path. - name: integration/module_utils/from_config_path.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/module_utils/overrides_builtin.yml b/tests/ansible/integration/module_utils/overrides_builtin.yml index 86d88312..daa59e8b 100644 --- a/tests/ansible/integration/module_utils/overrides_builtin.yml +++ b/tests/ansible/integration/module_utils/overrides_builtin.yml @@ -1,6 +1,6 @@ - name: integration/module_utils/overrides_builtin.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true roles: - overrides_modrole diff --git a/tests/ansible/integration/playbook_semantics/become_flags.yml b/tests/ansible/integration/playbook_semantics/become_flags.yml index ac762643..6644835b 100644 --- a/tests/ansible/integration/playbook_semantics/become_flags.yml +++ b/tests/ansible/integration/playbook_semantics/become_flags.yml @@ -3,7 +3,7 @@ # - name: integration/playbook_semantics/become_flags.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: @@ -18,7 +18,7 @@ tags: - become_flags -- hosts: test-targets +- hosts: test_targets any_errors_fatal: true become_flags: -E tasks: diff --git a/tests/ansible/integration/playbook_semantics/delegate_to.yml b/tests/ansible/integration/playbook_semantics/delegate_to.yml index 7536258f..e02d8fef 100644 --- a/tests/ansible/integration/playbook_semantics/delegate_to.yml +++ b/tests/ansible/integration/playbook_semantics/delegate_to.yml @@ -1,5 +1,5 @@ - name: integration/playbook_semantics/delegate_to.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: # diff --git a/tests/ansible/integration/playbook_semantics/environment.yml b/tests/ansible/integration/playbook_semantics/environment.yml index 01e8ce04..2f14add1 100644 --- a/tests/ansible/integration/playbook_semantics/environment.yml +++ b/tests/ansible/integration/playbook_semantics/environment.yml @@ -1,7 +1,7 @@ # Ensure environment: is preserved during call. - name: integration/playbook_semantics/environment.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - shell: echo $SOME_ENV diff --git a/tests/ansible/integration/playbook_semantics/with_items.yml b/tests/ansible/integration/playbook_semantics/with_items.yml index 12a92bba..706e5faf 100644 --- a/tests/ansible/integration/playbook_semantics/with_items.yml +++ b/tests/ansible/integration/playbook_semantics/with_items.yml @@ -2,7 +2,7 @@ # the correct context. - name: integration/playbook_semantics/with_items.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/process/unix_socket_cleanup.yml b/tests/ansible/integration/process/unix_socket_cleanup.yml index 6aeac609..4bedb129 100644 --- a/tests/ansible/integration/process/unix_socket_cleanup.yml +++ b/tests/ansible/integration/process/unix_socket_cleanup.yml @@ -1,5 +1,5 @@ -- hosts: test-targets[0] +- hosts: test_targets[0] tasks: - mitogen_action_script: script: | @@ -10,7 +10,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -c local -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -c local -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets args: chdir: ../.. register: out diff --git a/tests/ansible/integration/runner/atexit.yml b/tests/ansible/integration/runner/atexit.yml index 9cab0a5d..ab954be1 100644 --- a/tests/ansible/integration/runner/atexit.yml +++ b/tests/ansible/integration/runner/atexit.yml @@ -3,7 +3,7 @@ # completion. - name: integration/runner/atexit.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: false vars: diff --git a/tests/ansible/integration/runner/builtin_command_module.yml b/tests/ansible/integration/runner/builtin_command_module.yml index b567bee6..52e0c7d9 100644 --- a/tests/ansible/integration/runner/builtin_command_module.yml +++ b/tests/ansible/integration/runner/builtin_command_module.yml @@ -1,6 +1,6 @@ - name: integration/runner/builtin_command_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true gather_facts: true tasks: diff --git a/tests/ansible/integration/runner/crashy_new_style_module.yml b/tests/ansible/integration/runner/crashy_new_style_module.yml index 77f45861..39ee4a1d 100644 --- a/tests/ansible/integration/runner/crashy_new_style_module.yml +++ b/tests/ansible/integration/runner/crashy_new_style_module.yml @@ -1,7 +1,7 @@ # issue #527: catch exceptions from crashy modules. - name: integration/runner/crashy_new_style_module.yml - hosts: test-targets + hosts: test_targets tasks: - custom_python_run_script: script: kaboom diff --git a/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml b/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml index d2d2281c..8f4ad16d 100644 --- a/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml +++ b/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml @@ -1,6 +1,6 @@ # https://github.com/dw/mitogen/issues/291 - name: integration/runner/custom_bash_hashbang_argument.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/custom_bash_old_style_module.yml b/tests/ansible/integration/runner/custom_bash_old_style_module.yml index 122b8fde..8a2921fd 100644 --- a/tests/ansible/integration/runner/custom_bash_old_style_module.yml +++ b/tests/ansible/integration/runner/custom_bash_old_style_module.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_bash_old_style_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/custom_bash_want_json_module.yml b/tests/ansible/integration/runner/custom_bash_want_json_module.yml index b4242e9a..1dbd88a4 100644 --- a/tests/ansible/integration/runner/custom_bash_want_json_module.yml +++ b/tests/ansible/integration/runner/custom_bash_want_json_module.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_bash_want_json_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - custom_bash_want_json_module: diff --git a/tests/ansible/integration/runner/custom_binary_producing_json.yml b/tests/ansible/integration/runner/custom_binary_producing_json.yml index 6dfeefc3..58444806 100644 --- a/tests/ansible/integration/runner/custom_binary_producing_json.yml +++ b/tests/ansible/integration/runner/custom_binary_producing_json.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_binary_producing_json.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true gather_facts: true tasks: diff --git a/tests/ansible/integration/runner/custom_binary_producing_junk.yml b/tests/ansible/integration/runner/custom_binary_producing_junk.yml index 97fc92fe..b846e6ee 100644 --- a/tests/ansible/integration/runner/custom_binary_producing_junk.yml +++ b/tests/ansible/integration/runner/custom_binary_producing_junk.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_binary_producing_junk.yml - hosts: test-targets + hosts: test_targets gather_facts: true tasks: - block: @@ -23,7 +23,7 @@ - custom_binary_producing_junk -- hosts: test-targets +- hosts: test_targets any_errors_fatal: true tasks: - assert: diff --git a/tests/ansible/integration/runner/custom_binary_single_null.yml b/tests/ansible/integration/runner/custom_binary_single_null.yml index 353cc58d..0aaaf8a8 100644 --- a/tests/ansible/integration/runner/custom_binary_single_null.yml +++ b/tests/ansible/integration/runner/custom_binary_single_null.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_binary_single_null.yml - hosts: test-targets + hosts: test_targets tasks: - custom_binary_single_null: foo: true @@ -9,7 +9,7 @@ tags: - custom_binary_single_null -- hosts: test-targets +- hosts: test_targets any_errors_fatal: true tasks: - assert: diff --git a/tests/ansible/integration/runner/custom_perl_json_args_module.yml b/tests/ansible/integration/runner/custom_perl_json_args_module.yml index 6201318a..67e0833c 100644 --- a/tests/ansible/integration/runner/custom_perl_json_args_module.yml +++ b/tests/ansible/integration/runner/custom_perl_json_args_module.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_perl_json_args_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - custom_perl_json_args_module: diff --git a/tests/ansible/integration/runner/custom_perl_want_json_module.yml b/tests/ansible/integration/runner/custom_perl_want_json_module.yml index 9c39b1b6..d6863845 100644 --- a/tests/ansible/integration/runner/custom_perl_want_json_module.yml +++ b/tests/ansible/integration/runner/custom_perl_want_json_module.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_perl_want_json_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - custom_perl_want_json_module: diff --git a/tests/ansible/integration/runner/custom_python_json_args_module.yml b/tests/ansible/integration/runner/custom_python_json_args_module.yml index 33a03ba0..2ce564ac 100644 --- a/tests/ansible/integration/runner/custom_python_json_args_module.yml +++ b/tests/ansible/integration/runner/custom_python_json_args_module.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_python_json_args_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - custom_python_json_args_module: diff --git a/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml b/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml index 1562e307..a8d9cfa9 100644 --- a/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml +++ b/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml @@ -1,6 +1,6 @@ - name: integration/runner/custom_python_new_style_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - custom_python_new_style_missing_interpreter: diff --git a/tests/ansible/integration/runner/custom_python_new_style_module.yml b/tests/ansible/integration/runner/custom_python_new_style_module.yml index b22fdc14..d0c54760 100644 --- a/tests/ansible/integration/runner/custom_python_new_style_module.yml +++ b/tests/ansible/integration/runner/custom_python_new_style_module.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_python_new_style_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: # without Mitogen Ansible 2.10 hangs on this play diff --git a/tests/ansible/integration/runner/custom_python_prehistoric_module.yml b/tests/ansible/integration/runner/custom_python_prehistoric_module.yml index 4ddec8c5..b2d9270f 100644 --- a/tests/ansible/integration/runner/custom_python_prehistoric_module.yml +++ b/tests/ansible/integration/runner/custom_python_prehistoric_module.yml @@ -1,7 +1,7 @@ # issue #555 - name: integration/runner/custom_python_prehistoric_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - custom_python_prehistoric_module: diff --git a/tests/ansible/integration/runner/custom_python_want_json_module.yml b/tests/ansible/integration/runner/custom_python_want_json_module.yml index d704ee11..f45515bf 100644 --- a/tests/ansible/integration/runner/custom_python_want_json_module.yml +++ b/tests/ansible/integration/runner/custom_python_want_json_module.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_python_want_json_module.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: - custom_python_want_json_module: diff --git a/tests/ansible/integration/runner/custom_script_interpreter.yml b/tests/ansible/integration/runner/custom_script_interpreter.yml index 03ea6718..7bb546c1 100644 --- a/tests/ansible/integration/runner/custom_script_interpreter.yml +++ b/tests/ansible/integration/runner/custom_script_interpreter.yml @@ -1,5 +1,5 @@ - name: integration/runner/custom_script_interpreter.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/environment_isolation.yml b/tests/ansible/integration/runner/environment_isolation.yml index 90110d01..4d6c2ebf 100644 --- a/tests/ansible/integration/runner/environment_isolation.yml +++ b/tests/ansible/integration/runner/environment_isolation.yml @@ -2,7 +2,7 @@ - name: integration/runner/environment_isolation.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true gather_facts: true tasks: diff --git a/tests/ansible/integration/runner/etc_environment.yml b/tests/ansible/integration/runner/etc_environment.yml index 3a44c753..9f53630a 100644 --- a/tests/ansible/integration/runner/etc_environment.yml +++ b/tests/ansible/integration/runner/etc_environment.yml @@ -3,7 +3,7 @@ # but less likely to brick a development workstation - name: integration/runner/etc_environment.yml - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true gather_facts: true tasks: diff --git a/tests/ansible/integration/runner/forking_active.yml b/tests/ansible/integration/runner/forking_active.yml index 6a0e322d..7fa56c29 100644 --- a/tests/ansible/integration/runner/forking_active.yml +++ b/tests/ansible/integration/runner/forking_active.yml @@ -1,5 +1,5 @@ - name: integration/runner/forking_active.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/forking_correct_parent.yml b/tests/ansible/integration/runner/forking_correct_parent.yml index 7fe54e7b..5c748e78 100644 --- a/tests/ansible/integration/runner/forking_correct_parent.yml +++ b/tests/ansible/integration/runner/forking_correct_parent.yml @@ -1,6 +1,6 @@ - name: integration/runner/forking_correct_parent.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/forking_inactive.yml b/tests/ansible/integration/runner/forking_inactive.yml index 37282f82..6432d94e 100644 --- a/tests/ansible/integration/runner/forking_inactive.yml +++ b/tests/ansible/integration/runner/forking_inactive.yml @@ -1,7 +1,7 @@ # Verify non-async jobs run in-process. - name: integration/runner/forking_inactive.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/runner/missing_module.yml b/tests/ansible/integration/runner/missing_module.yml index 676012d9..e0afeb70 100644 --- a/tests/ansible/integration/runner/missing_module.yml +++ b/tests/ansible/integration/runner/missing_module.yml @@ -1,13 +1,13 @@ - name: integration/runner/missing_module.yml - hosts: test-targets[0] + hosts: test_targets[0] connection: local tasks: - connection: local command: | ansible -vvv -i "{{MITOGEN_INVENTORY_FILE}}" - test-targets + test_targets -m missing_module args: chdir: ../.. diff --git a/tests/ansible/integration/ssh/config.yml b/tests/ansible/integration/ssh/config.yml index 4e6748b1..61aaeac3 100644 --- a/tests/ansible/integration/ssh/config.yml +++ b/tests/ansible/integration/ssh/config.yml @@ -1,7 +1,7 @@ # issue #334: test expanduser() on key file during config generation. - name: integration/ssh/config.yml - hosts: test-targets + hosts: test_targets connection: ssh vars: ansible_private_key_file: ~/fakekey diff --git a/tests/ansible/integration/ssh/timeouts.yml b/tests/ansible/integration/ssh/timeouts.yml index d697905a..afbd69c1 100644 --- a/tests/ansible/integration/ssh/timeouts.yml +++ b/tests/ansible/integration/ssh/timeouts.yml @@ -1,13 +1,13 @@ # Ensure 'ssh' connections time out correctly. - name: integration/ssh/timeouts.yml - hosts: test-targets + hosts: test_targets tasks: - connection: local command: | ansible -vvv -i "{{MITOGEN_INVENTORY_FILE}}" - test-targets + test_targets -m custom_python_detect_environment -e ansible_user=mitogen__slow_user -e ansible_password=slow_user_password args: diff --git a/tests/ansible/integration/ssh/variables.yml b/tests/ansible/integration/ssh/variables.yml index d05ac288..b8a102ad 100644 --- a/tests/ansible/integration/ssh/variables.yml +++ b/tests/ansible/integration/ssh/variables.yml @@ -3,7 +3,7 @@ # whatever reason. - name: integration/ssh/variables.yml - hosts: test-targets[0] + hosts: test_targets[0] connection: local vars: # ControlMaster has the effect of caching the previous auth to the same @@ -18,7 +18,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_ssh_user=mitogen__has_sudo -e ansible_ssh_pass=has_sudo_password args: @@ -29,7 +29,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_ssh_user=mitogen__has_sudo -e ansible_ssh_pass=wrong_password args: @@ -48,7 +48,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_user=mitogen__has_sudo -e ansible_ssh_pass=has_sudo_password args: @@ -59,7 +59,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_user=mitogen__has_sudo -e ansible_ssh_pass=wrong_password args: @@ -78,7 +78,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_user=mitogen__has_sudo -e ansible_password=has_sudo_password args: @@ -89,7 +89,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_user=mitogen__has_sudo -e ansible_password=wrong_password args: @@ -113,7 +113,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_user=mitogen__has_sudo_pubkey -e ansible_ssh_private_key_file=../data/docker/mitogen__has_sudo_pubkey.key args: @@ -124,7 +124,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets -e ansible_user=mitogen__has_sudo -e ansible_ssh_private_key_file=/dev/null args: diff --git a/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml b/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml index b2ae7641..f23d28a5 100644 --- a/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml +++ b/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml @@ -2,7 +2,7 @@ # issue #294: ensure running mixed vanilla/Mitogen succeeds. - name: integration/strategy/_mixed_mitogen_vanilla.yml (mitogen_linear) - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true strategy: mitogen_linear run_once: true @@ -21,7 +21,7 @@ - mitogen_linear - name: integration/strategy/_mixed_mitogen_vanilla.yml (linear) - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true strategy: linear tasks: @@ -39,7 +39,7 @@ - linear - name: integration/strategy/_mixed_mitogen_vanilla.yml (mitogen_linear) - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true strategy: mitogen_linear tasks: diff --git a/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml b/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml index e073d11a..5a4663f6 100644 --- a/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml +++ b/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml @@ -2,7 +2,7 @@ # issue #294: ensure running mixed vanilla/Mitogen succeeds. - name: integration/strategy/_mixed_vanilla_mitogen.yml (linear) - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true strategy: linear tasks: @@ -20,7 +20,7 @@ - linear - name: integration/strategy/_mixed_vanilla_mitogen.yml (mitogen_linear) - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true strategy: mitogen_linear tasks: @@ -38,7 +38,7 @@ - mitogen_linear - name: integration/strategy/_mixed_vanilla_mitogen.yml (linear) - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true strategy: linear tasks: diff --git a/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml b/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml index 0f462fea..7bf03744 100644 --- a/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml +++ b/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml @@ -1,6 +1,6 @@ - name: integration/strategy/mixed_vanilla_mitogen.yml (linear->mitogen->linear) - hosts: test-targets[0] + hosts: test_targets[0] any_errors_fatal: true tasks: - connection: local diff --git a/tests/ansible/integration/stub_connections/kubectl.yml b/tests/ansible/integration/stub_connections/kubectl.yml index e4b881f8..f88a0a9e 100644 --- a/tests/ansible/integration/stub_connections/kubectl.yml +++ b/tests/ansible/integration/stub_connections/kubectl.yml @@ -1,6 +1,6 @@ - name: integration/stub_connections/kubectl.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/stub_connections/lxc.yml b/tests/ansible/integration/stub_connections/lxc.yml index ec79cdac..399b1c7d 100644 --- a/tests/ansible/integration/stub_connections/lxc.yml +++ b/tests/ansible/integration/stub_connections/lxc.yml @@ -1,6 +1,6 @@ - name: integration/stub_connections/lxc.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/stub_connections/lxd.yml b/tests/ansible/integration/stub_connections/lxd.yml index cb03232f..91d62491 100644 --- a/tests/ansible/integration/stub_connections/lxd.yml +++ b/tests/ansible/integration/stub_connections/lxd.yml @@ -1,6 +1,6 @@ - name: integration/stub_connections/lxd.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/stub_connections/mitogen_doas.yml b/tests/ansible/integration/stub_connections/mitogen_doas.yml index 5e545935..3887ed57 100644 --- a/tests/ansible/integration/stub_connections/mitogen_doas.yml +++ b/tests/ansible/integration/stub_connections/mitogen_doas.yml @@ -1,6 +1,6 @@ - name: integration/stub_connections/mitogen_doas.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/stub_connections/mitogen_sudo.yml b/tests/ansible/integration/stub_connections/mitogen_sudo.yml index 36f69814..32431c99 100644 --- a/tests/ansible/integration/stub_connections/mitogen_sudo.yml +++ b/tests/ansible/integration/stub_connections/mitogen_sudo.yml @@ -1,6 +1,6 @@ - name: integration/stub_connections/mitogen_sudo.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: true tasks: diff --git a/tests/ansible/integration/stub_connections/setns_lxc.yml b/tests/ansible/integration/stub_connections/setns_lxc.yml index 44717504..a6e1cfae 100644 --- a/tests/ansible/integration/stub_connections/setns_lxc.yml +++ b/tests/ansible/integration/stub_connections/setns_lxc.yml @@ -3,7 +3,7 @@ # child Ansible via sudo. But that only works if sudo works. - name: integration/stub_connections/setns_lxc.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: false connection: local diff --git a/tests/ansible/integration/stub_connections/setns_lxd.yml b/tests/ansible/integration/stub_connections/setns_lxd.yml index 841f7805..7a6073e1 100644 --- a/tests/ansible/integration/stub_connections/setns_lxd.yml +++ b/tests/ansible/integration/stub_connections/setns_lxd.yml @@ -3,7 +3,7 @@ # child Ansible via sudo. But that only works if sudo works. - name: integration/stub_connections/setns_lxd.yml - hosts: test-targets + hosts: test_targets gather_facts: false any_errors_fatal: false connection: local diff --git a/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml b/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml index fdc61c05..5b3e3862 100644 --- a/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml +++ b/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml @@ -2,7 +2,7 @@ # does not conflict with operation. - name: regression/issue_109__target_has_old_ansible_installed.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true gather_facts: true tasks: diff --git a/tests/ansible/regression/issue_113__duplicate_module_imports.yml b/tests/ansible/regression/issue_113__duplicate_module_imports.yml index b479e025..63c02c4a 100644 --- a/tests/ansible/regression/issue_113__duplicate_module_imports.yml +++ b/tests/ansible/regression/issue_113__duplicate_module_imports.yml @@ -3,7 +3,7 @@ - name: regression/issue_113__duplicate_module_imports.yml any_errors_fatal: true - hosts: test-targets + hosts: test_targets tasks: - name: Get auth token diff --git a/tests/ansible/regression/issue_118__script_not_marked_exec.yml b/tests/ansible/regression/issue_118__script_not_marked_exec.yml index e02c49d3..c2f585ba 100644 --- a/tests/ansible/regression/issue_118__script_not_marked_exec.yml +++ b/tests/ansible/regression/issue_118__script_not_marked_exec.yml @@ -1,7 +1,7 @@ # issue #118 repro: chmod +x not happening during script upload - name: regression/issue_118__script_not_marked_exec.yml - hosts: test-targets + hosts: test_targets become: True tasks: diff --git a/tests/ansible/regression/issue_122__environment_difference.yml b/tests/ansible/regression/issue_122__environment_difference.yml index 273a49ae..156bde20 100644 --- a/tests/ansible/regression/issue_122__environment_difference.yml +++ b/tests/ansible/regression/issue_122__environment_difference.yml @@ -6,7 +6,7 @@ # - name: regression/issue_122__environment_difference.yml - hosts: test-targets + hosts: test_targets tasks: - script: scripts/print_env.py diff --git a/tests/ansible/regression/issue_140__thread_pileup.yml b/tests/ansible/regression/issue_140__thread_pileup.yml index e6ea83ce..452ef185 100644 --- a/tests/ansible/regression/issue_140__thread_pileup.yml +++ b/tests/ansible/regression/issue_140__thread_pileup.yml @@ -3,7 +3,7 @@ # with_items should crash for other reasons (RAM, file descriptor count, ..) - name: regression/issue_140__thread_pileup.yml - hosts: test-targets + hosts: test_targets any_errors_fatal: true tasks: diff --git a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml index 4da6f544..7d14838b 100644 --- a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml +++ b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml @@ -4,7 +4,7 @@ # can test for. - name: regression/issue_152__local_action_wrong_interpreter.yml - hosts: test-targets + hosts: test_targets connection: local any_errors_fatal: true tasks: diff --git a/tests/ansible/regression/issue_152__virtualenv_python_fails.yml b/tests/ansible/regression/issue_152__virtualenv_python_fails.yml index d3bda041..50bfffbf 100644 --- a/tests/ansible/regression/issue_152__virtualenv_python_fails.yml +++ b/tests/ansible/regression/issue_152__virtualenv_python_fails.yml @@ -1,7 +1,7 @@ - name: regression/issue_152__virtualenv_python_fails.yml any_errors_fatal: true gather_facts: true - hosts: test-targets + hosts: test_targets tasks: - custom_python_detect_environment: register: lout diff --git a/tests/ansible/regression/issue_154__module_state_leaks.yml b/tests/ansible/regression/issue_154__module_state_leaks.yml index 59b970d9..a5cea343 100644 --- a/tests/ansible/regression/issue_154__module_state_leaks.yml +++ b/tests/ansible/regression/issue_154__module_state_leaks.yml @@ -3,7 +3,7 @@ - name: regression/issue_154__module_state_leaks.yml any_errors_fatal: true - hosts: test-targets + hosts: test_targets tasks: - custom_python_leaky_class_vars: diff --git a/tests/ansible/regression/issue_177__copy_module_failing.yml b/tests/ansible/regression/issue_177__copy_module_failing.yml index 7da39962..f2590423 100644 --- a/tests/ansible/regression/issue_177__copy_module_failing.yml +++ b/tests/ansible/regression/issue_177__copy_module_failing.yml @@ -1,6 +1,6 @@ - name: regression/issue_177__copy_module_failing.yml any_errors_fatal: true - hosts: test-targets + hosts: test_targets tasks: - copy: diff --git a/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml b/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml index 2433e566..74f995c6 100644 --- a/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml +++ b/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml @@ -2,7 +2,7 @@ # AnsibleModuleError. Ensure file fails correctly. - name: regression/issue_332_ansiblemoduleerror_first_occurrence.yml - hosts: test-targets + hosts: test_targets tasks: - file: path=/usr/bin/does-not-exist mode='a-s' state=file follow=yes ignore_errors: true diff --git a/tests/ansible/regression/issue_558_unarchive_failed.yml b/tests/ansible/regression/issue_558_unarchive_failed.yml index 23e9caad..b36a5ec9 100644 --- a/tests/ansible/regression/issue_558_unarchive_failed.yml +++ b/tests/ansible/regression/issue_558_unarchive_failed.yml @@ -2,7 +2,7 @@ # respecting the passed in 'tmp' parameter on Ansible 2.3. - name: regression/issue_558_unarchive_failed.yml - hosts: test-targets + hosts: test_targets tasks: - file: state=absent path=/tmp/foo - file: state=directory path=/tmp/foo diff --git a/tests/ansible/regression/issue_590__sys_modules_crap.yml b/tests/ansible/regression/issue_590__sys_modules_crap.yml index 52b3ea97..8efa0679 100644 --- a/tests/ansible/regression/issue_590__sys_modules_crap.yml +++ b/tests/ansible/regression/issue_590__sys_modules_crap.yml @@ -1,5 +1,5 @@ -- hosts: test-targets +- hosts: test_targets tasks: - meta: end_play when: ansible_version.full < '2.8' diff --git a/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml b/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml index 02676cb5..80b4afbc 100644 --- a/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml +++ b/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml @@ -3,7 +3,7 @@ # to call getcwd() before AnsibleModule has had a chance to clean up the # process environment. -- hosts: test-targets +- hosts: test_targets tasks: - meta: end_play when: not is_mitogen diff --git a/tests/ansible/setup/report.yml b/tests/ansible/setup/report.yml index 9077158f..ba0c92a5 100644 --- a/tests/ansible/setup/report.yml +++ b/tests/ansible/setup/report.yml @@ -1,5 +1,5 @@ - name: Report runtime settings - hosts: localhost:test-targets + hosts: localhost:test_targets gather_facts: true tasks: - debug: {var: ansible_facts.distribution}