From c2ec86cb78f3c43bc5f2484d1888571e27225702 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 13 Oct 2016 10:03:19 -0700 Subject: [PATCH] Migrate Windows CI roles to test targets. (#18005) --- test/integration/Makefile | 6 +++--- .../prepare_win_tests/meta/main.yml | 0 .../prepare_win_tests/tasks/main.yml | 0 .../win_async_wrapper}/library/async_test.ps1 | 0 .../win_async_wrapper}/tasks/main.yml | 0 .../win_command}/tasks/main.yml | 0 .../win_copy}/files/empty.txt | 0 .../win_copy}/files/foo.txt | 0 .../win_copy}/files/subdir/bar.txt | 0 .../win_copy}/files/subdir/subdir2/baz.txt | 0 .../subdir/subdir2/subdir3/subdir4/qux.txt | 0 .../win_copy}/meta/main.yml | 0 .../win_copy}/tasks/main.yml | 0 .../win_feature}/defaults/main.yml | 0 .../win_feature}/tasks/main.yml | 0 .../win_fetch}/tasks/main.yml | 0 .../win_file}/files/foo.txt | 0 .../win_file}/files/foobar/directory/fileC | 0 .../win_file}/files/foobar/directory/fileD | 0 .../win_file}/files/foobar/fileA | 0 .../win_file}/files/foobar/fileB | 0 .../win_file}/meta/main.yml | 0 .../win_file}/tasks/main.yml | 0 .../win_get_url}/defaults/main.yml | 0 .../win_get_url}/tasks/main.yml | 0 .../win_group}/defaults/main.yml | 0 .../win_group}/tasks/main.yml | 0 .../win_lineinfile}/files/test.txt | 0 .../win_lineinfile}/files/test_quoting.txt | 0 .../win_lineinfile}/files/testempty.txt | 0 .../win_lineinfile}/files/testnoeof.txt | 0 .../win_lineinfile}/meta/main.yml | 0 .../win_lineinfile}/tasks/main.yml | 0 .../win_msi}/defaults/main.yml | 0 .../win_msi}/tasks/main.yml | 0 .../win_package}/defaults/main.yml | 0 .../win_package}/tasks/main.yml | 0 .../win_ping}/library/win_ping_set_attr.ps1 | 0 .../library/win_ping_strict_mode_error.ps1 | 0 .../library/win_ping_syntax_error.ps1 | 0 .../win_ping}/library/win_ping_throw.ps1 | 0 .../library/win_ping_throw_string.ps1 | 0 .../win_ping}/tasks/main.yml | 0 .../win_raw}/tasks/main.yml | 0 .../win_regedit}/meta/main.yml | 0 .../win_regedit}/tasks/main.yml | 0 .../win_regmerge}/files/settings1.reg | Bin .../win_regmerge}/files/settings2.reg | Bin .../win_regmerge}/files/settings3.reg | Bin .../win_regmerge}/meta/main.yml | 0 .../win_regmerge}/tasks/main.yml | 0 .../templates/win_line_ending.j2 | 0 .../win_regmerge}/vars/main.yml | 0 .../win_script}/defaults/main.yml | 0 .../win_script}/files/test_script.bat | 0 .../win_script}/files/test_script.cmd | 0 .../win_script}/files/test_script.ps1 | 0 .../win_script}/files/test_script_bool.ps1 | 0 .../files/test_script_creates_file.ps1 | 0 .../files/test_script_removes_file.ps1 | 0 .../files/test_script_with_args.ps1 | 0 .../files/test_script_with_errors.ps1 | 0 .../files/test_script_with_splatting.ps1 | 0 .../win_script}/tasks/main.yml | 0 .../win_service}/defaults/main.yml | 0 .../win_service}/tasks/main.yml | 0 .../win_setup}/tasks/main.yml | 0 .../win_shell}/tasks/main.yml | 0 .../win_slurp}/tasks/main.yml | 0 .../win_stat}/tasks/main.yml | 0 .../win_template}/files/foo.txt | 0 .../win_template}/meta/main.yml | 0 .../win_template}/tasks/main.yml | 0 .../win_template}/templates/foo.j2 | 0 .../win_template}/vars/main.yml | 0 .../win_user}/defaults/main.yml | 0 .../win_user}/files/lockout_user.ps1 | 0 .../win_user}/tasks/main.yml | 0 test/integration/test_win_group1.yml | 16 ++++++++-------- test/integration/test_win_group2.yml | 18 +++++++++--------- test/integration/test_win_group3.yml | 12 ++++++------ 81 files changed, 26 insertions(+), 26 deletions(-) rename test/integration/{roles => targets}/prepare_win_tests/meta/main.yml (100%) rename test/integration/{roles => targets}/prepare_win_tests/tasks/main.yml (100%) rename test/integration/{roles/test_win_async_wrapper => targets/win_async_wrapper}/library/async_test.ps1 (100%) rename test/integration/{roles/test_win_async_wrapper => targets/win_async_wrapper}/tasks/main.yml (100%) rename test/integration/{roles/test_win_command => targets/win_command}/tasks/main.yml (100%) rename test/integration/{roles/test_win_copy => targets/win_copy}/files/empty.txt (100%) rename test/integration/{roles/test_win_copy => targets/win_copy}/files/foo.txt (100%) rename test/integration/{roles/test_win_copy => targets/win_copy}/files/subdir/bar.txt (100%) rename test/integration/{roles/test_win_copy => targets/win_copy}/files/subdir/subdir2/baz.txt (100%) rename test/integration/{roles/test_win_copy => targets/win_copy}/files/subdir/subdir2/subdir3/subdir4/qux.txt (100%) rename test/integration/{roles/test_win_copy => targets/win_copy}/meta/main.yml (100%) rename test/integration/{roles/test_win_copy => targets/win_copy}/tasks/main.yml (100%) rename test/integration/{roles/test_win_feature => targets/win_feature}/defaults/main.yml (100%) rename test/integration/{roles/test_win_feature => targets/win_feature}/tasks/main.yml (100%) rename test/integration/{roles/test_win_fetch => targets/win_fetch}/tasks/main.yml (100%) rename test/integration/{roles/test_win_file => targets/win_file}/files/foo.txt (100%) rename test/integration/{roles/test_win_file => targets/win_file}/files/foobar/directory/fileC (100%) rename test/integration/{roles/test_win_file => targets/win_file}/files/foobar/directory/fileD (100%) rename test/integration/{roles/test_win_file => targets/win_file}/files/foobar/fileA (100%) rename test/integration/{roles/test_win_file => targets/win_file}/files/foobar/fileB (100%) rename test/integration/{roles/test_win_file => targets/win_file}/meta/main.yml (100%) rename test/integration/{roles/test_win_file => targets/win_file}/tasks/main.yml (100%) rename test/integration/{roles/test_win_get_url => targets/win_get_url}/defaults/main.yml (100%) rename test/integration/{roles/test_win_get_url => targets/win_get_url}/tasks/main.yml (100%) rename test/integration/{roles/test_win_group => targets/win_group}/defaults/main.yml (100%) rename test/integration/{roles/test_win_group => targets/win_group}/tasks/main.yml (100%) rename test/integration/{roles/test_win_lineinfile => targets/win_lineinfile}/files/test.txt (100%) rename test/integration/{roles/test_win_lineinfile => targets/win_lineinfile}/files/test_quoting.txt (100%) rename test/integration/{roles/test_win_lineinfile => targets/win_lineinfile}/files/testempty.txt (100%) rename test/integration/{roles/test_win_lineinfile => targets/win_lineinfile}/files/testnoeof.txt (100%) rename test/integration/{roles/test_win_lineinfile => targets/win_lineinfile}/meta/main.yml (100%) rename test/integration/{roles/test_win_lineinfile => targets/win_lineinfile}/tasks/main.yml (100%) rename test/integration/{roles/test_win_msi => targets/win_msi}/defaults/main.yml (100%) rename test/integration/{roles/test_win_msi => targets/win_msi}/tasks/main.yml (100%) rename test/integration/{roles/test_win_package => targets/win_package}/defaults/main.yml (100%) rename test/integration/{roles/test_win_package => targets/win_package}/tasks/main.yml (100%) rename test/integration/{roles/test_win_ping => targets/win_ping}/library/win_ping_set_attr.ps1 (100%) rename test/integration/{roles/test_win_ping => targets/win_ping}/library/win_ping_strict_mode_error.ps1 (100%) rename test/integration/{roles/test_win_ping => targets/win_ping}/library/win_ping_syntax_error.ps1 (100%) rename test/integration/{roles/test_win_ping => targets/win_ping}/library/win_ping_throw.ps1 (100%) rename test/integration/{roles/test_win_ping => targets/win_ping}/library/win_ping_throw_string.ps1 (100%) rename test/integration/{roles/test_win_ping => targets/win_ping}/tasks/main.yml (100%) rename test/integration/{roles/test_win_raw => targets/win_raw}/tasks/main.yml (100%) rename test/integration/{roles/test_win_regedit => targets/win_regedit}/meta/main.yml (100%) rename test/integration/{roles/test_win_regedit => targets/win_regedit}/tasks/main.yml (100%) rename test/integration/{roles/test_win_regmerge => targets/win_regmerge}/files/settings1.reg (100%) rename test/integration/{roles/test_win_regmerge => targets/win_regmerge}/files/settings2.reg (100%) rename test/integration/{roles/test_win_regmerge => targets/win_regmerge}/files/settings3.reg (100%) rename test/integration/{roles/test_win_regmerge => targets/win_regmerge}/meta/main.yml (100%) rename test/integration/{roles/test_win_regmerge => targets/win_regmerge}/tasks/main.yml (100%) rename test/integration/{roles/test_win_regmerge => targets/win_regmerge}/templates/win_line_ending.j2 (100%) rename test/integration/{roles/test_win_regmerge => targets/win_regmerge}/vars/main.yml (100%) rename test/integration/{roles/test_win_script => targets/win_script}/defaults/main.yml (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script.bat (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script.cmd (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script.ps1 (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script_bool.ps1 (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script_creates_file.ps1 (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script_removes_file.ps1 (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script_with_args.ps1 (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script_with_errors.ps1 (100%) rename test/integration/{roles/test_win_script => targets/win_script}/files/test_script_with_splatting.ps1 (100%) rename test/integration/{roles/test_win_script => targets/win_script}/tasks/main.yml (100%) rename test/integration/{roles/test_win_service => targets/win_service}/defaults/main.yml (100%) rename test/integration/{roles/test_win_service => targets/win_service}/tasks/main.yml (100%) rename test/integration/{roles/test_win_setup => targets/win_setup}/tasks/main.yml (100%) rename test/integration/{roles/test_win_shell => targets/win_shell}/tasks/main.yml (100%) rename test/integration/{roles/test_win_slurp => targets/win_slurp}/tasks/main.yml (100%) rename test/integration/{roles/test_win_stat => targets/win_stat}/tasks/main.yml (100%) rename test/integration/{roles/test_win_template => targets/win_template}/files/foo.txt (100%) rename test/integration/{roles/test_win_template => targets/win_template}/meta/main.yml (100%) rename test/integration/{roles/test_win_template => targets/win_template}/tasks/main.yml (100%) rename test/integration/{roles/test_win_template => targets/win_template}/templates/foo.j2 (100%) rename test/integration/{roles/test_win_template => targets/win_template}/vars/main.yml (100%) rename test/integration/{roles/test_win_user => targets/win_user}/defaults/main.yml (100%) rename test/integration/{roles/test_win_user => targets/win_user}/files/lockout_user.ps1 (100%) rename test/integration/{roles/test_win_user => targets/win_user}/tasks/main.yml (100%) diff --git a/test/integration/Makefile b/test/integration/Makefile index c52c072729a..49fa3bf344e 100644 --- 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)) diff --git a/test/integration/roles/prepare_win_tests/meta/main.yml b/test/integration/targets/prepare_win_tests/meta/main.yml similarity index 100% rename from test/integration/roles/prepare_win_tests/meta/main.yml rename to test/integration/targets/prepare_win_tests/meta/main.yml diff --git a/test/integration/roles/prepare_win_tests/tasks/main.yml b/test/integration/targets/prepare_win_tests/tasks/main.yml similarity index 100% rename from test/integration/roles/prepare_win_tests/tasks/main.yml rename to test/integration/targets/prepare_win_tests/tasks/main.yml diff --git a/test/integration/roles/test_win_async_wrapper/library/async_test.ps1 b/test/integration/targets/win_async_wrapper/library/async_test.ps1 similarity index 100% rename from test/integration/roles/test_win_async_wrapper/library/async_test.ps1 rename to test/integration/targets/win_async_wrapper/library/async_test.ps1 diff --git a/test/integration/roles/test_win_async_wrapper/tasks/main.yml b/test/integration/targets/win_async_wrapper/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_async_wrapper/tasks/main.yml rename to test/integration/targets/win_async_wrapper/tasks/main.yml diff --git a/test/integration/roles/test_win_command/tasks/main.yml b/test/integration/targets/win_command/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_command/tasks/main.yml rename to test/integration/targets/win_command/tasks/main.yml diff --git a/test/integration/roles/test_win_copy/files/empty.txt b/test/integration/targets/win_copy/files/empty.txt similarity index 100% rename from test/integration/roles/test_win_copy/files/empty.txt rename to test/integration/targets/win_copy/files/empty.txt diff --git a/test/integration/roles/test_win_copy/files/foo.txt b/test/integration/targets/win_copy/files/foo.txt similarity index 100% rename from test/integration/roles/test_win_copy/files/foo.txt rename to test/integration/targets/win_copy/files/foo.txt diff --git a/test/integration/roles/test_win_copy/files/subdir/bar.txt b/test/integration/targets/win_copy/files/subdir/bar.txt similarity index 100% rename from test/integration/roles/test_win_copy/files/subdir/bar.txt rename to test/integration/targets/win_copy/files/subdir/bar.txt diff --git a/test/integration/roles/test_win_copy/files/subdir/subdir2/baz.txt b/test/integration/targets/win_copy/files/subdir/subdir2/baz.txt similarity index 100% rename from test/integration/roles/test_win_copy/files/subdir/subdir2/baz.txt rename to test/integration/targets/win_copy/files/subdir/subdir2/baz.txt diff --git a/test/integration/roles/test_win_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt b/test/integration/targets/win_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt similarity index 100% rename from test/integration/roles/test_win_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt rename to test/integration/targets/win_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt diff --git a/test/integration/roles/test_win_copy/meta/main.yml b/test/integration/targets/win_copy/meta/main.yml similarity index 100% rename from test/integration/roles/test_win_copy/meta/main.yml rename to test/integration/targets/win_copy/meta/main.yml diff --git a/test/integration/roles/test_win_copy/tasks/main.yml b/test/integration/targets/win_copy/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_copy/tasks/main.yml rename to test/integration/targets/win_copy/tasks/main.yml diff --git a/test/integration/roles/test_win_feature/defaults/main.yml b/test/integration/targets/win_feature/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_feature/defaults/main.yml rename to test/integration/targets/win_feature/defaults/main.yml diff --git a/test/integration/roles/test_win_feature/tasks/main.yml b/test/integration/targets/win_feature/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_feature/tasks/main.yml rename to test/integration/targets/win_feature/tasks/main.yml diff --git a/test/integration/roles/test_win_fetch/tasks/main.yml b/test/integration/targets/win_fetch/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_fetch/tasks/main.yml rename to test/integration/targets/win_fetch/tasks/main.yml diff --git a/test/integration/roles/test_win_file/files/foo.txt b/test/integration/targets/win_file/files/foo.txt similarity index 100% rename from test/integration/roles/test_win_file/files/foo.txt rename to test/integration/targets/win_file/files/foo.txt diff --git a/test/integration/roles/test_win_file/files/foobar/directory/fileC b/test/integration/targets/win_file/files/foobar/directory/fileC similarity index 100% rename from test/integration/roles/test_win_file/files/foobar/directory/fileC rename to test/integration/targets/win_file/files/foobar/directory/fileC diff --git a/test/integration/roles/test_win_file/files/foobar/directory/fileD b/test/integration/targets/win_file/files/foobar/directory/fileD similarity index 100% rename from test/integration/roles/test_win_file/files/foobar/directory/fileD rename to test/integration/targets/win_file/files/foobar/directory/fileD diff --git a/test/integration/roles/test_win_file/files/foobar/fileA b/test/integration/targets/win_file/files/foobar/fileA similarity index 100% rename from test/integration/roles/test_win_file/files/foobar/fileA rename to test/integration/targets/win_file/files/foobar/fileA diff --git a/test/integration/roles/test_win_file/files/foobar/fileB b/test/integration/targets/win_file/files/foobar/fileB similarity index 100% rename from test/integration/roles/test_win_file/files/foobar/fileB rename to test/integration/targets/win_file/files/foobar/fileB diff --git a/test/integration/roles/test_win_file/meta/main.yml b/test/integration/targets/win_file/meta/main.yml similarity index 100% rename from test/integration/roles/test_win_file/meta/main.yml rename to test/integration/targets/win_file/meta/main.yml diff --git a/test/integration/roles/test_win_file/tasks/main.yml b/test/integration/targets/win_file/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_file/tasks/main.yml rename to test/integration/targets/win_file/tasks/main.yml diff --git a/test/integration/roles/test_win_get_url/defaults/main.yml b/test/integration/targets/win_get_url/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_get_url/defaults/main.yml rename to test/integration/targets/win_get_url/defaults/main.yml diff --git a/test/integration/roles/test_win_get_url/tasks/main.yml b/test/integration/targets/win_get_url/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_get_url/tasks/main.yml rename to test/integration/targets/win_get_url/tasks/main.yml diff --git a/test/integration/roles/test_win_group/defaults/main.yml b/test/integration/targets/win_group/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_group/defaults/main.yml rename to test/integration/targets/win_group/defaults/main.yml diff --git a/test/integration/roles/test_win_group/tasks/main.yml b/test/integration/targets/win_group/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_group/tasks/main.yml rename to test/integration/targets/win_group/tasks/main.yml diff --git a/test/integration/roles/test_win_lineinfile/files/test.txt b/test/integration/targets/win_lineinfile/files/test.txt similarity index 100% rename from test/integration/roles/test_win_lineinfile/files/test.txt rename to test/integration/targets/win_lineinfile/files/test.txt diff --git a/test/integration/roles/test_win_lineinfile/files/test_quoting.txt b/test/integration/targets/win_lineinfile/files/test_quoting.txt similarity index 100% rename from test/integration/roles/test_win_lineinfile/files/test_quoting.txt rename to test/integration/targets/win_lineinfile/files/test_quoting.txt diff --git a/test/integration/roles/test_win_lineinfile/files/testempty.txt b/test/integration/targets/win_lineinfile/files/testempty.txt similarity index 100% rename from test/integration/roles/test_win_lineinfile/files/testempty.txt rename to test/integration/targets/win_lineinfile/files/testempty.txt diff --git a/test/integration/roles/test_win_lineinfile/files/testnoeof.txt b/test/integration/targets/win_lineinfile/files/testnoeof.txt similarity index 100% rename from test/integration/roles/test_win_lineinfile/files/testnoeof.txt rename to test/integration/targets/win_lineinfile/files/testnoeof.txt diff --git a/test/integration/roles/test_win_lineinfile/meta/main.yml b/test/integration/targets/win_lineinfile/meta/main.yml similarity index 100% rename from test/integration/roles/test_win_lineinfile/meta/main.yml rename to test/integration/targets/win_lineinfile/meta/main.yml diff --git a/test/integration/roles/test_win_lineinfile/tasks/main.yml b/test/integration/targets/win_lineinfile/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_lineinfile/tasks/main.yml rename to test/integration/targets/win_lineinfile/tasks/main.yml diff --git a/test/integration/roles/test_win_msi/defaults/main.yml b/test/integration/targets/win_msi/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_msi/defaults/main.yml rename to test/integration/targets/win_msi/defaults/main.yml diff --git a/test/integration/roles/test_win_msi/tasks/main.yml b/test/integration/targets/win_msi/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_msi/tasks/main.yml rename to test/integration/targets/win_msi/tasks/main.yml diff --git a/test/integration/roles/test_win_package/defaults/main.yml b/test/integration/targets/win_package/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_package/defaults/main.yml rename to test/integration/targets/win_package/defaults/main.yml diff --git a/test/integration/roles/test_win_package/tasks/main.yml b/test/integration/targets/win_package/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_package/tasks/main.yml rename to test/integration/targets/win_package/tasks/main.yml diff --git a/test/integration/roles/test_win_ping/library/win_ping_set_attr.ps1 b/test/integration/targets/win_ping/library/win_ping_set_attr.ps1 similarity index 100% rename from test/integration/roles/test_win_ping/library/win_ping_set_attr.ps1 rename to test/integration/targets/win_ping/library/win_ping_set_attr.ps1 diff --git a/test/integration/roles/test_win_ping/library/win_ping_strict_mode_error.ps1 b/test/integration/targets/win_ping/library/win_ping_strict_mode_error.ps1 similarity index 100% rename from test/integration/roles/test_win_ping/library/win_ping_strict_mode_error.ps1 rename to test/integration/targets/win_ping/library/win_ping_strict_mode_error.ps1 diff --git a/test/integration/roles/test_win_ping/library/win_ping_syntax_error.ps1 b/test/integration/targets/win_ping/library/win_ping_syntax_error.ps1 similarity index 100% rename from test/integration/roles/test_win_ping/library/win_ping_syntax_error.ps1 rename to test/integration/targets/win_ping/library/win_ping_syntax_error.ps1 diff --git a/test/integration/roles/test_win_ping/library/win_ping_throw.ps1 b/test/integration/targets/win_ping/library/win_ping_throw.ps1 similarity index 100% rename from test/integration/roles/test_win_ping/library/win_ping_throw.ps1 rename to test/integration/targets/win_ping/library/win_ping_throw.ps1 diff --git a/test/integration/roles/test_win_ping/library/win_ping_throw_string.ps1 b/test/integration/targets/win_ping/library/win_ping_throw_string.ps1 similarity index 100% rename from test/integration/roles/test_win_ping/library/win_ping_throw_string.ps1 rename to test/integration/targets/win_ping/library/win_ping_throw_string.ps1 diff --git a/test/integration/roles/test_win_ping/tasks/main.yml b/test/integration/targets/win_ping/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_ping/tasks/main.yml rename to test/integration/targets/win_ping/tasks/main.yml diff --git a/test/integration/roles/test_win_raw/tasks/main.yml b/test/integration/targets/win_raw/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_raw/tasks/main.yml rename to test/integration/targets/win_raw/tasks/main.yml diff --git a/test/integration/roles/test_win_regedit/meta/main.yml b/test/integration/targets/win_regedit/meta/main.yml similarity index 100% rename from test/integration/roles/test_win_regedit/meta/main.yml rename to test/integration/targets/win_regedit/meta/main.yml diff --git a/test/integration/roles/test_win_regedit/tasks/main.yml b/test/integration/targets/win_regedit/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_regedit/tasks/main.yml rename to test/integration/targets/win_regedit/tasks/main.yml diff --git a/test/integration/roles/test_win_regmerge/files/settings1.reg b/test/integration/targets/win_regmerge/files/settings1.reg similarity index 100% rename from test/integration/roles/test_win_regmerge/files/settings1.reg rename to test/integration/targets/win_regmerge/files/settings1.reg diff --git a/test/integration/roles/test_win_regmerge/files/settings2.reg b/test/integration/targets/win_regmerge/files/settings2.reg similarity index 100% rename from test/integration/roles/test_win_regmerge/files/settings2.reg rename to test/integration/targets/win_regmerge/files/settings2.reg diff --git a/test/integration/roles/test_win_regmerge/files/settings3.reg b/test/integration/targets/win_regmerge/files/settings3.reg similarity index 100% rename from test/integration/roles/test_win_regmerge/files/settings3.reg rename to test/integration/targets/win_regmerge/files/settings3.reg diff --git a/test/integration/roles/test_win_regmerge/meta/main.yml b/test/integration/targets/win_regmerge/meta/main.yml similarity index 100% rename from test/integration/roles/test_win_regmerge/meta/main.yml rename to test/integration/targets/win_regmerge/meta/main.yml diff --git a/test/integration/roles/test_win_regmerge/tasks/main.yml b/test/integration/targets/win_regmerge/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_regmerge/tasks/main.yml rename to test/integration/targets/win_regmerge/tasks/main.yml diff --git a/test/integration/roles/test_win_regmerge/templates/win_line_ending.j2 b/test/integration/targets/win_regmerge/templates/win_line_ending.j2 similarity index 100% rename from test/integration/roles/test_win_regmerge/templates/win_line_ending.j2 rename to test/integration/targets/win_regmerge/templates/win_line_ending.j2 diff --git a/test/integration/roles/test_win_regmerge/vars/main.yml b/test/integration/targets/win_regmerge/vars/main.yml similarity index 100% rename from test/integration/roles/test_win_regmerge/vars/main.yml rename to test/integration/targets/win_regmerge/vars/main.yml diff --git a/test/integration/roles/test_win_script/defaults/main.yml b/test/integration/targets/win_script/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_script/defaults/main.yml rename to test/integration/targets/win_script/defaults/main.yml diff --git a/test/integration/roles/test_win_script/files/test_script.bat b/test/integration/targets/win_script/files/test_script.bat similarity index 100% rename from test/integration/roles/test_win_script/files/test_script.bat rename to test/integration/targets/win_script/files/test_script.bat diff --git a/test/integration/roles/test_win_script/files/test_script.cmd b/test/integration/targets/win_script/files/test_script.cmd similarity index 100% rename from test/integration/roles/test_win_script/files/test_script.cmd rename to test/integration/targets/win_script/files/test_script.cmd diff --git a/test/integration/roles/test_win_script/files/test_script.ps1 b/test/integration/targets/win_script/files/test_script.ps1 similarity index 100% rename from test/integration/roles/test_win_script/files/test_script.ps1 rename to test/integration/targets/win_script/files/test_script.ps1 diff --git a/test/integration/roles/test_win_script/files/test_script_bool.ps1 b/test/integration/targets/win_script/files/test_script_bool.ps1 similarity index 100% rename from test/integration/roles/test_win_script/files/test_script_bool.ps1 rename to test/integration/targets/win_script/files/test_script_bool.ps1 diff --git a/test/integration/roles/test_win_script/files/test_script_creates_file.ps1 b/test/integration/targets/win_script/files/test_script_creates_file.ps1 similarity index 100% rename from test/integration/roles/test_win_script/files/test_script_creates_file.ps1 rename to test/integration/targets/win_script/files/test_script_creates_file.ps1 diff --git a/test/integration/roles/test_win_script/files/test_script_removes_file.ps1 b/test/integration/targets/win_script/files/test_script_removes_file.ps1 similarity index 100% rename from test/integration/roles/test_win_script/files/test_script_removes_file.ps1 rename to test/integration/targets/win_script/files/test_script_removes_file.ps1 diff --git a/test/integration/roles/test_win_script/files/test_script_with_args.ps1 b/test/integration/targets/win_script/files/test_script_with_args.ps1 similarity index 100% rename from test/integration/roles/test_win_script/files/test_script_with_args.ps1 rename to test/integration/targets/win_script/files/test_script_with_args.ps1 diff --git a/test/integration/roles/test_win_script/files/test_script_with_errors.ps1 b/test/integration/targets/win_script/files/test_script_with_errors.ps1 similarity index 100% rename from test/integration/roles/test_win_script/files/test_script_with_errors.ps1 rename to test/integration/targets/win_script/files/test_script_with_errors.ps1 diff --git a/test/integration/roles/test_win_script/files/test_script_with_splatting.ps1 b/test/integration/targets/win_script/files/test_script_with_splatting.ps1 similarity index 100% rename from test/integration/roles/test_win_script/files/test_script_with_splatting.ps1 rename to test/integration/targets/win_script/files/test_script_with_splatting.ps1 diff --git a/test/integration/roles/test_win_script/tasks/main.yml b/test/integration/targets/win_script/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_script/tasks/main.yml rename to test/integration/targets/win_script/tasks/main.yml diff --git a/test/integration/roles/test_win_service/defaults/main.yml b/test/integration/targets/win_service/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_service/defaults/main.yml rename to test/integration/targets/win_service/defaults/main.yml diff --git a/test/integration/roles/test_win_service/tasks/main.yml b/test/integration/targets/win_service/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_service/tasks/main.yml rename to test/integration/targets/win_service/tasks/main.yml diff --git a/test/integration/roles/test_win_setup/tasks/main.yml b/test/integration/targets/win_setup/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_setup/tasks/main.yml rename to test/integration/targets/win_setup/tasks/main.yml diff --git a/test/integration/roles/test_win_shell/tasks/main.yml b/test/integration/targets/win_shell/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_shell/tasks/main.yml rename to test/integration/targets/win_shell/tasks/main.yml diff --git a/test/integration/roles/test_win_slurp/tasks/main.yml b/test/integration/targets/win_slurp/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_slurp/tasks/main.yml rename to test/integration/targets/win_slurp/tasks/main.yml diff --git a/test/integration/roles/test_win_stat/tasks/main.yml b/test/integration/targets/win_stat/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_stat/tasks/main.yml rename to test/integration/targets/win_stat/tasks/main.yml diff --git a/test/integration/roles/test_win_template/files/foo.txt b/test/integration/targets/win_template/files/foo.txt similarity index 100% rename from test/integration/roles/test_win_template/files/foo.txt rename to test/integration/targets/win_template/files/foo.txt diff --git a/test/integration/roles/test_win_template/meta/main.yml b/test/integration/targets/win_template/meta/main.yml similarity index 100% rename from test/integration/roles/test_win_template/meta/main.yml rename to test/integration/targets/win_template/meta/main.yml diff --git a/test/integration/roles/test_win_template/tasks/main.yml b/test/integration/targets/win_template/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_template/tasks/main.yml rename to test/integration/targets/win_template/tasks/main.yml diff --git a/test/integration/roles/test_win_template/templates/foo.j2 b/test/integration/targets/win_template/templates/foo.j2 similarity index 100% rename from test/integration/roles/test_win_template/templates/foo.j2 rename to test/integration/targets/win_template/templates/foo.j2 diff --git a/test/integration/roles/test_win_template/vars/main.yml b/test/integration/targets/win_template/vars/main.yml similarity index 100% rename from test/integration/roles/test_win_template/vars/main.yml rename to test/integration/targets/win_template/vars/main.yml diff --git a/test/integration/roles/test_win_user/defaults/main.yml b/test/integration/targets/win_user/defaults/main.yml similarity index 100% rename from test/integration/roles/test_win_user/defaults/main.yml rename to test/integration/targets/win_user/defaults/main.yml diff --git a/test/integration/roles/test_win_user/files/lockout_user.ps1 b/test/integration/targets/win_user/files/lockout_user.ps1 similarity index 100% rename from test/integration/roles/test_win_user/files/lockout_user.ps1 rename to test/integration/targets/win_user/files/lockout_user.ps1 diff --git a/test/integration/roles/test_win_user/tasks/main.yml b/test/integration/targets/win_user/tasks/main.yml similarity index 100% rename from test/integration/roles/test_win_user/tasks/main.yml rename to test/integration/targets/win_user/tasks/main.yml diff --git a/test/integration/test_win_group1.yml b/test/integration/test_win_group1.yml index 6375220caa6..0aeaddb814e 100644 --- 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 } diff --git a/test/integration/test_win_group2.yml b/test/integration/test_win_group2.yml index c276e9c1e77..5f669630e08 100644 --- 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 } diff --git a/test/integration/test_win_group3.yml b/test/integration/test_win_group3.yml index 43afe1c4461..983fe1c5730 100644 --- 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 }