Migrate Windows CI roles to test targets. (#18005)

8 years ago · c2ec86cb78
parent 9182619fef
commit c2ec86cb78
81 changed files with 26 additions and 26 deletions
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@ -171,13 +171,13 @@ ci_win3: test_win_group3 test_connection_winrm
 test_winrm: test_win_group1 test_win_group2 test_win_group3

 test_win_group1:
-	ansible-playbook test_win_group1.yml -i inventory.winrm -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
+	ANSIBLE_ROLES_PATH=targets ansible-playbook test_win_group1.yml -i inventory.winrm -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)

 test_win_group2:
-	ansible-playbook test_win_group2.yml -i inventory.winrm -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
+	ANSIBLE_ROLES_PATH=targets ansible-playbook test_win_group2.yml -i inventory.winrm -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)

 test_win_group3:
-	ansible-playbook test_win_group3.yml -i inventory.winrm -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
+	ANSIBLE_ROLES_PATH=targets ansible-playbook test_win_group3.yml -i inventory.winrm -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)

 test_tags:
 	(cd targets/tags && ./runme.sh $(TEST_FLAGS))
--- a/test/integration/targets/prepare_win_tests/meta/main.yml
+++ b/test/integration/targets/prepare_win_tests/meta/main.yml
--- a/test/integration/targets/prepare_win_tests/tasks/main.yml
+++ b/test/integration/targets/prepare_win_tests/tasks/main.yml
--- a/test/integration/roles/test_win_async_wrapper/library/async_test.ps1
+++ b/test/integration/roles/test_win_async_wrapper/library/async_test.ps1
--- a/test/integration/roles/test_win_async_wrapper/tasks/main.yml
+++ b/test/integration/roles/test_win_async_wrapper/tasks/main.yml
--- a/test/integration/roles/test_win_command/tasks/main.yml
+++ b/test/integration/roles/test_win_command/tasks/main.yml
--- a/test/integration/roles/test_win_copy/files/empty.txt
+++ b/test/integration/roles/test_win_copy/files/empty.txt
--- a/test/integration/roles/test_win_copy/files/foo.txt
+++ b/test/integration/roles/test_win_copy/files/foo.txt
--- a/test/integration/roles/test_win_copy/files/subdir/bar.txt
+++ b/test/integration/roles/test_win_copy/files/subdir/bar.txt
--- a/test/integration/roles/test_win_copy/files/subdir/subdir2/baz.txt
+++ b/test/integration/roles/test_win_copy/files/subdir/subdir2/baz.txt
--- a/test/integration/roles/test_win_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
+++ b/test/integration/roles/test_win_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
--- a/test/integration/roles/test_win_copy/meta/main.yml
+++ b/test/integration/roles/test_win_copy/meta/main.yml
--- a/test/integration/roles/test_win_copy/tasks/main.yml
+++ b/test/integration/roles/test_win_copy/tasks/main.yml
--- a/test/integration/roles/test_win_feature/defaults/main.yml
+++ b/test/integration/roles/test_win_feature/defaults/main.yml
--- a/test/integration/roles/test_win_feature/tasks/main.yml
+++ b/test/integration/roles/test_win_feature/tasks/main.yml
--- a/test/integration/roles/test_win_fetch/tasks/main.yml
+++ b/test/integration/roles/test_win_fetch/tasks/main.yml
--- a/test/integration/roles/test_win_file/files/foo.txt
+++ b/test/integration/roles/test_win_file/files/foo.txt
--- a/test/integration/roles/test_win_file/files/foobar/directory/fileC
+++ b/test/integration/roles/test_win_file/files/foobar/directory/fileC
--- a/test/integration/roles/test_win_file/files/foobar/directory/fileD
+++ b/test/integration/roles/test_win_file/files/foobar/directory/fileD
--- a/test/integration/roles/test_win_file/files/foobar/fileA
+++ b/test/integration/roles/test_win_file/files/foobar/fileA
--- a/test/integration/roles/test_win_file/files/foobar/fileB
+++ b/test/integration/roles/test_win_file/files/foobar/fileB
--- a/test/integration/roles/test_win_file/meta/main.yml
+++ b/test/integration/roles/test_win_file/meta/main.yml
--- a/test/integration/roles/test_win_file/tasks/main.yml
+++ b/test/integration/roles/test_win_file/tasks/main.yml
--- a/test/integration/roles/test_win_get_url/defaults/main.yml
+++ b/test/integration/roles/test_win_get_url/defaults/main.yml
--- a/test/integration/roles/test_win_get_url/tasks/main.yml
+++ b/test/integration/roles/test_win_get_url/tasks/main.yml
--- a/test/integration/roles/test_win_group/defaults/main.yml
+++ b/test/integration/roles/test_win_group/defaults/main.yml
--- a/test/integration/roles/test_win_group/tasks/main.yml
+++ b/test/integration/roles/test_win_group/tasks/main.yml
--- a/test/integration/roles/test_win_lineinfile/files/test.txt
+++ b/test/integration/roles/test_win_lineinfile/files/test.txt
--- a/test/integration/roles/test_win_lineinfile/files/test_quoting.txt
+++ b/test/integration/roles/test_win_lineinfile/files/test_quoting.txt
--- a/test/integration/roles/test_win_lineinfile/files/testempty.txt
+++ b/test/integration/roles/test_win_lineinfile/files/testempty.txt
--- a/test/integration/roles/test_win_lineinfile/files/testnoeof.txt
+++ b/test/integration/roles/test_win_lineinfile/files/testnoeof.txt
--- a/test/integration/roles/test_win_lineinfile/meta/main.yml
+++ b/test/integration/roles/test_win_lineinfile/meta/main.yml
--- a/test/integration/roles/test_win_lineinfile/tasks/main.yml
+++ b/test/integration/roles/test_win_lineinfile/tasks/main.yml
--- a/test/integration/roles/test_win_msi/defaults/main.yml
+++ b/test/integration/roles/test_win_msi/defaults/main.yml
--- a/test/integration/roles/test_win_msi/tasks/main.yml
+++ b/test/integration/roles/test_win_msi/tasks/main.yml
--- a/test/integration/roles/test_win_package/defaults/main.yml
+++ b/test/integration/roles/test_win_package/defaults/main.yml
--- a/test/integration/roles/test_win_package/tasks/main.yml
+++ b/test/integration/roles/test_win_package/tasks/main.yml
--- a/test/integration/roles/test_win_ping/library/win_ping_set_attr.ps1
+++ b/test/integration/roles/test_win_ping/library/win_ping_set_attr.ps1
--- a/test/integration/roles/test_win_ping/library/win_ping_strict_mode_error.ps1
+++ b/test/integration/roles/test_win_ping/library/win_ping_strict_mode_error.ps1
--- a/test/integration/roles/test_win_ping/library/win_ping_syntax_error.ps1
+++ b/test/integration/roles/test_win_ping/library/win_ping_syntax_error.ps1
--- a/test/integration/roles/test_win_ping/library/win_ping_throw.ps1
+++ b/test/integration/roles/test_win_ping/library/win_ping_throw.ps1
--- a/test/integration/roles/test_win_ping/library/win_ping_throw_string.ps1
+++ b/test/integration/roles/test_win_ping/library/win_ping_throw_string.ps1
--- a/test/integration/roles/test_win_ping/tasks/main.yml
+++ b/test/integration/roles/test_win_ping/tasks/main.yml
--- a/test/integration/roles/test_win_raw/tasks/main.yml
+++ b/test/integration/roles/test_win_raw/tasks/main.yml
--- a/test/integration/roles/test_win_regedit/meta/main.yml
+++ b/test/integration/roles/test_win_regedit/meta/main.yml
--- a/test/integration/roles/test_win_regedit/tasks/main.yml
+++ b/test/integration/roles/test_win_regedit/tasks/main.yml
--- a/test/integration/roles/test_win_regmerge/files/settings1.reg
+++ b/test/integration/roles/test_win_regmerge/files/settings1.reg
--- a/test/integration/roles/test_win_regmerge/files/settings2.reg
+++ b/test/integration/roles/test_win_regmerge/files/settings2.reg
--- a/test/integration/roles/test_win_regmerge/files/settings3.reg
+++ b/test/integration/roles/test_win_regmerge/files/settings3.reg
--- a/test/integration/roles/test_win_regmerge/meta/main.yml
+++ b/test/integration/roles/test_win_regmerge/meta/main.yml
--- a/test/integration/roles/test_win_regmerge/tasks/main.yml
+++ b/test/integration/roles/test_win_regmerge/tasks/main.yml
--- a/test/integration/roles/test_win_regmerge/templates/win_line_ending.j2
+++ b/test/integration/roles/test_win_regmerge/templates/win_line_ending.j2
--- a/test/integration/roles/test_win_regmerge/vars/main.yml
+++ b/test/integration/roles/test_win_regmerge/vars/main.yml
--- a/test/integration/roles/test_win_script/defaults/main.yml
+++ b/test/integration/roles/test_win_script/defaults/main.yml
--- a/test/integration/roles/test_win_script/files/test_script.bat
+++ b/test/integration/roles/test_win_script/files/test_script.bat
--- a/test/integration/roles/test_win_script/files/test_script.cmd
+++ b/test/integration/roles/test_win_script/files/test_script.cmd
--- a/test/integration/roles/test_win_script/files/test_script.ps1
+++ b/test/integration/roles/test_win_script/files/test_script.ps1
--- a/test/integration/roles/test_win_script/files/test_script_bool.ps1
+++ b/test/integration/roles/test_win_script/files/test_script_bool.ps1
--- a/test/integration/roles/test_win_script/files/test_script_creates_file.ps1
+++ b/test/integration/roles/test_win_script/files/test_script_creates_file.ps1
--- a/test/integration/roles/test_win_script/files/test_script_removes_file.ps1
+++ b/test/integration/roles/test_win_script/files/test_script_removes_file.ps1
--- a/test/integration/roles/test_win_script/files/test_script_with_args.ps1
+++ b/test/integration/roles/test_win_script/files/test_script_with_args.ps1
--- a/test/integration/roles/test_win_script/files/test_script_with_errors.ps1
+++ b/test/integration/roles/test_win_script/files/test_script_with_errors.ps1
--- a/test/integration/roles/test_win_script/files/test_script_with_splatting.ps1
+++ b/test/integration/roles/test_win_script/files/test_script_with_splatting.ps1
--- a/test/integration/roles/test_win_script/tasks/main.yml
+++ b/test/integration/roles/test_win_script/tasks/main.yml
--- a/test/integration/roles/test_win_service/defaults/main.yml
+++ b/test/integration/roles/test_win_service/defaults/main.yml
--- a/test/integration/roles/test_win_service/tasks/main.yml
+++ b/test/integration/roles/test_win_service/tasks/main.yml
--- a/test/integration/roles/test_win_setup/tasks/main.yml
+++ b/test/integration/roles/test_win_setup/tasks/main.yml
--- a/test/integration/roles/test_win_shell/tasks/main.yml
+++ b/test/integration/roles/test_win_shell/tasks/main.yml
--- a/test/integration/roles/test_win_slurp/tasks/main.yml
+++ b/test/integration/roles/test_win_slurp/tasks/main.yml
--- a/test/integration/roles/test_win_stat/tasks/main.yml
+++ b/test/integration/roles/test_win_stat/tasks/main.yml
--- a/test/integration/roles/test_win_template/files/foo.txt
+++ b/test/integration/roles/test_win_template/files/foo.txt
--- a/test/integration/roles/test_win_template/meta/main.yml
+++ b/test/integration/roles/test_win_template/meta/main.yml
--- a/test/integration/roles/test_win_template/tasks/main.yml
+++ b/test/integration/roles/test_win_template/tasks/main.yml
--- a/test/integration/roles/test_win_template/templates/foo.j2
+++ b/test/integration/roles/test_win_template/templates/foo.j2
--- a/test/integration/roles/test_win_template/vars/main.yml
+++ b/test/integration/roles/test_win_template/vars/main.yml
--- a/test/integration/roles/test_win_user/defaults/main.yml
+++ b/test/integration/roles/test_win_user/defaults/main.yml
--- a/test/integration/roles/test_win_user/files/lockout_user.ps1
+++ b/test/integration/roles/test_win_user/files/lockout_user.ps1
--- a/test/integration/roles/test_win_user/tasks/main.yml
+++ b/test/integration/roles/test_win_user/tasks/main.yml
--- a/test/integration/test_win_group1.yml
+++ b/test/integration/test_win_group1.yml
@ -1,11 +1,11 @@
 - hosts: windows
  gather_facts: false
  roles:
-    - { role: test_win_raw, tags: test_win_raw }
-    - { role: test_win_script, tags: test_win_script }
-    - { role: test_win_ping, tags: test_win_ping }
-    - { role: test_win_setup, tags: test_win_setup }
-    - { role: test_win_slurp, tags: test_win_slurp }
-    - { role: test_win_fetch, tags: test_win_fetch }
-    - { role: test_win_regmerge, tags: test_win_regmerge }
-    - { role: test_win_regedit, tags: test_win_regedit }
+    - { role: win_raw, tags: test_win_raw }
+    - { role: win_script, tags: test_win_script }
+    - { role: win_ping, tags: test_win_ping }
+    - { role: win_setup, tags: test_win_setup }
+    - { role: win_slurp, tags: test_win_slurp }
+    - { role: win_fetch, tags: test_win_fetch }
+    - { role: win_regmerge, tags: test_win_regmerge }
+    - { role: win_regedit, tags: test_win_regedit }
--- a/test/integration/test_win_group2.yml
+++ b/test/integration/test_win_group2.yml
@ -1,12 +1,12 @@
 - hosts: windows
  gather_facts: false
  roles:
-    - { role: test_win_group, tags: test_win_group }
-    - { role: test_win_file, tags: test_win_file }
-    - { role: test_win_copy, tags: test_win_copy }
-    - { role: test_win_template, tags: test_win_template }
-    - { role: test_win_lineinfile, tags: test_win_lineinfile }
-    - { role: test_win_stat, tags: test_win_stat }
-    - { role: test_win_get_url, tags: test_win_get_url }
-    - { role: test_win_msi, tags: test_win_msi }
-    - { role: test_win_package, tags: test_win_package }
+    - { role: win_group, tags: test_win_group }
+    - { role: win_file, tags: test_win_file }
+    - { role: win_copy, tags: test_win_copy }
+    - { role: win_template, tags: test_win_template }
+    - { role: win_lineinfile, tags: test_win_lineinfile }
+    - { role: win_stat, tags: test_win_stat }
+    - { role: win_get_url, tags: test_win_get_url }
+    - { role: win_msi, tags: test_win_msi }
+    - { role: win_package, tags: test_win_package }
--- a/test/integration/test_win_group3.yml
+++ b/test/integration/test_win_group3.yml
@ -1,9 +1,9 @@
 - hosts: windows
  gather_facts: false
  roles:
-    - { role: test_win_service, tags: test_win_service }
-    - { role: test_win_feature, tags: test_win_feature }
-    - { role: test_win_user, tags: test_win_user }
-    - { role: test_win_async_wrapper, tags: test_win_async_wrapper }
-    - { role: test_win_shell, tags: test_win_shell }
-    - { role: test_win_command, tags: test_win_command }
+    - { role: win_service, tags: test_win_service }
+    - { role: win_feature, tags: test_win_feature }
+    - { role: win_user, tags: test_win_user }
+    - { role: win_async_wrapper, tags: test_win_async_wrapper }
+    - { role: win_shell, tags: test_win_shell }
+    - { role: win_command, tags: test_win_command }