From 75e4645ee70434e2706845ca9fe96d5823616eea Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Thu, 13 Oct 2016 09:09:25 -0700
Subject: [PATCH] Migrate Linux CI roles to test targets. (#17997)

---
 test/integration/Makefile                     |   4 +-
 test/integration/destructive.yml              |  36 +++++-----
 test/integration/non_destructive.yml          |  66 +++++++++---------
 .../add_host}/tasks/main.yml                  |   0
 .../apache2_module}/meta/main.yml             |   0
 .../apache2_module}/tasks/actualtest.yml      |   0
 .../apache2_module}/tasks/main.yml            |   0
 .../test_apt => targets/apt}/meta/main.yml    |   0
 .../apt}/tasks/apt-builddep.yml               |   0
 .../test_apt => targets/apt}/tasks/apt.yml    |   0
 .../test_apt => targets/apt}/tasks/main.yml   |   0
 .../apt_repository}/meta/main.yml             |   0
 .../apt_repository}/tasks/apt.yml             |   0
 .../apt_repository}/tasks/cleanup.yml         |   0
 .../apt_repository}/tasks/main.yml            |   0
 .../assemble}/files/fragment1                 |   0
 .../assemble}/files/fragment2                 |   0
 .../assemble}/files/fragment3                 |   0
 .../assemble}/files/fragment4                 |   0
 .../assemble}/files/fragment5                 |   0
 .../assemble}/meta/main.yml                   |   0
 .../assemble}/tasks/main.yml                  |   0
 .../async}/library/async_test.py              |   0
 .../async}/meta/main.yml                      |   0
 .../async}/tasks/main.yml                     |   0
 .../authorized_key}/defaults/main.yml         |   0
 .../authorized_key}/meta/main.yml             |   0
 .../authorized_key}/tasks/main.yml            |   0
 .../become}/files/baz.txt                     |   0
 .../become}/tasks/main.yml                    |   0
 .../become}/templates/bar.j2                  |   0
 .../become}/vars/default.yml                  |   0
 .../binary}/files/b64_latin1                  |   0
 .../binary}/files/b64_utf8                    |   0
 .../binary}/files/from_playbook               |   0
 .../binary}/meta/main.yml                     |   0
 .../binary}/tasks/main.yml                    |   0
 .../binary}/templates/b64_latin1_template.j2  |   0
 .../binary}/templates/b64_utf8_template.j2    |   0
 .../templates/from_playbook_template.j2       |   0
 .../binary}/vars/main.yml                     |   0
 .../changed_when}/meta/main.yml               |   0
 .../changed_when}/tasks/main.yml              |   0
 .../command_shell}/files/create_afile.sh      |   0
 .../command_shell}/files/remove_afile.sh      |   0
 .../command_shell}/files/test.sh              |   0
 .../command_shell}/meta/main.yml              |   0
 .../command_shell}/tasks/main.yml             |   0
 .../conditionals}/tasks/main.yml              |   0
 .../conditionals}/vars/main.yml               |   0
 .../test_copy => targets/copy}/files/foo.txt  |   0
 .../copy}/files/subdir/bar.txt                |   0
 .../copy}/files/subdir/subdir2/baz.txt        |   0
 .../subdir/subdir2/subdir3/subdir4/qux.txt    |   0
 .../test_copy => targets/copy}/meta/main.yml  |   0
 .../test_copy => targets/copy}/tasks/main.yml |   0
 .../docker}/files/devdockerCA.crt             |   0
 .../docker}/files/devdockerCA.key             |   0
 .../docker}/files/devdockerCA.srl             |   0
 .../docker}/files/docker-registry.htpasswd    |   0
 .../docker}/files/dockertest.ansible.com.crt  |   0
 .../docker}/files/dockertest.ansible.com.csr  |   0
 .../docker}/files/dockertest.ansible.com.key  |   0
 .../docker}/files/nginx-docker-registry.conf  |   0
 .../docker}/meta/main.yml                     |   0
 .../docker}/tasks/docker-setup-debian.yml     |   0
 .../docker}/tasks/docker-setup-rht.yml        |   0
 .../docker}/tasks/docker-tests.yml            |   0
 .../docker}/tasks/main.yml                    |   0
 .../docker}/tasks/registry-tests.yml          |   0
 .../library/test_integration_module           |   0
 .../embedded_module}/tasks/main.yml           |   0
 .../facts_d}/meta/main.yml                    |   0
 .../facts_d}/tasks/main.yml                   |   0
 .../failed_when}/tasks/main.yml               |   0
 .../fetch}/meta/main.yml                      |   0
 .../fetch}/tasks/main.yml                     |   0
 .../test_file => targets/file}/files/foo.txt  |   0
 .../file}/files/foobar/directory/fileC        |   0
 .../file}/files/foobar/directory/fileD        |   0
 .../file}/files/foobar/fileA                  |   0
 .../file}/files/foobar/fileB                  |   0
 .../test_file => targets/file}/meta/main.yml  |   0
 .../test_file => targets/file}/tasks/main.yml |   0
 .../file}/tasks/selinux_tests.yml             |   0
 .../filters}/files/9851.txt                   |   0
 .../filters}/files/foo.txt                    |   0
 .../filters}/meta/main.yml                    |   0
 .../filters}/tasks/main.yml                   |   0
 .../filters}/templates/foo.j2                 |   0
 .../filters}/templates/py26json.j2            |   0
 .../filters}/vars/main.yml                    |   0
 .../test_gem => targets/gem}/meta/main.yml    |   0
 .../test_gem => targets/gem}/tasks/main.yml   |   0
 .../get_url}/meta/main.yml                    |   0
 .../get_url}/tasks/main.yml                   |   0
 .../test_git => targets/git}/meta/main.yml    |   0
 .../test_git => targets/git}/tasks/main.yml   |   0
 .../test_hg => targets/hg}/meta/main.yml      |   0
 .../test_hg => targets/hg}/tasks/main.yml     |   0
 .../ignore_errors}/meta/main.yml              |   0
 .../ignore_errors}/tasks/main.yml             |   0
 .../include_vars}/defaults/main.yml           |   0
 .../include_vars}/tasks/main.yml              |   0
 .../include_vars}/vars/all/all.yml            |   0
 .../vars/environments/development/all.yml     |   0
 .../development/services/webapp.yml           |   0
 .../include_vars}/vars/services/webapp.yml    |   0
 .../iterators}/meta/main.yml                  |   0
 .../iterators}/tasks/main.yml                 |   0
 .../iterators}/vars/main.yml                  |   0
 .../lineinfile}/files/test.txt                |   0
 .../lineinfile}/files/testempty.txt           |   0
 .../lineinfile}/files/testnoeof.txt           |   0
 .../lineinfile}/meta/main.yml                 |   0
 .../lineinfile}/tasks/main.yml                |   0
 .../lookups}/meta/main.yml                    |   0
 .../lookups}/tasks/main.yml                   |   0
 .../lookups}/vars/main.yml                    |   0
 .../loops}/tasks/main.yml                     |   0
 .../mount}/tasks/main.yml                     |   0
 .../mysql_db}/defaults/main.yml               |   0
 .../mysql_db}/meta/main.yml                   |   0
 .../mysql_db}/tasks/main.yml                  |   0
 .../mysql_db}/tasks/state_dump_import.yml     |   0
 .../mysql_user}/defaults/main.yml             |   0
 .../mysql_user}/meta/main.yml                 |   0
 .../mysql_user}/tasks/assert_no_user.yml      |   0
 .../mysql_user}/tasks/assert_user.yml         |   0
 .../mysql_user}/tasks/create_user.yml         |   0
 .../mysql_user}/tasks/main.yml                |   0
 .../mysql_user}/tasks/remove_user.yml         |   0
 .../mysql_user}/tasks/test_privs.yml          |   0
 .../tasks/user_password_update_test.yml       |   0
 .../mysql_variables}/defaults/main.yml        |   0
 .../mysql_variables}/meta/main.yml            |   0
 .../tasks/assert_fail_msg.yml                 |   0
 .../mysql_variables}/tasks/assert_var.yml     |   0
 .../tasks/assert_var_output.yml               |   0
 .../mysql_variables}/tasks/main.yml           |   0
 .../test_ping => targets/ping}/tasks/main.yml |   0
 .../test_pip => targets/pip}/meta/main.yml    |   0
 .../test_pip => targets/pip}/tasks/main.yml   |   0
 .../test_pip => targets/pip}/tasks/pip.yml    |   0
 .../postgresql}/defaults/main.yml             |   0
 .../postgresql}/meta/main.yml                 |   0
 .../postgresql}/tasks/main.yml                |   0
 .../prepare_http_tests/defaults/main.yml      |   0
 .../prepare_http_tests/tasks/main.yml         |   0
 .../prepare_http_tests/vars/httptester.yml    |   0
 .../prepare_tests/tasks}/main.yml             |   0
 .../script}/files/create_afile.sh             |   0
 .../script}/files/remove_afile.sh             |   0
 .../script}/files/test.sh                     |   0
 .../script}/meta/main.yml                     |   0
 .../script}/tasks/main.yml                    |   0
 .../service}/files/ansible-broken.upstart     |   0
 .../service}/files/ansible.systemd            |   0
 .../service}/files/ansible.sysv               |   0
 .../service}/files/ansible.upstart            |   0
 .../service}/files/ansible_test_service       |   0
 .../service}/meta/main.yml                    |   0
 .../service}/tasks/main.yml                   |   0
 .../service}/tasks/systemd_cleanup.yml        |   0
 .../service}/tasks/systemd_setup.yml          |   0
 .../service}/tasks/sysv_cleanup.yml           |   0
 .../service}/tasks/sysv_setup.yml             |   0
 .../service}/tasks/upstart_cleanup.yml        |   0
 .../service}/tasks/upstart_setup.yml          |   0
 .../service/templates}/main.yml               |   0
 .../setup_mysql_db/defaults/main.yml          |   0
 .../setup_mysql_db/tasks/main.yml             |   0
 .../setup_mysql_db/vars/Debian.yml            |   0
 .../setup_mysql_db/vars/Fedora.yml            |   0
 .../setup_mysql_db/vars/RedHat-7.yml          |   0
 .../setup_mysql_db/vars/RedHat.yml            |   0
 .../setup_mysql_db/vars/Suse.yml              |   0
 .../setup_postgresql_db/defaults/main.yml     |   0
 .../setup_postgresql_db/files/pg_hba.conf     |   0
 .../setup_postgresql_db/tasks/main.yml        |   0
 .../setup_postgresql_db/vars/Debian-8.yml     |   0
 .../setup_postgresql_db/vars/Ubuntu-12.yml    |   0
 .../setup_postgresql_db/vars/Ubuntu-14.yml    |   0
 .../setup_postgresql_db/vars/Ubuntu-16.yml    |   0
 .../setup_postgresql_db/vars/default.yml      |   0
 .../special_vars}/meta/main.yml               |   0
 .../special_vars}/tasks/main.yml              |   0
 .../special_vars}/templates/foo.j2            |   0
 .../targets/special_vars/vars/main.yml        |   0
 .../test_stat => targets/stat}/files/foo.txt  |   0
 .../test_stat => targets/stat}/meta/main.yml  |   0
 .../test_stat => targets/stat}/tasks/main.yml |   0
 .../subversion}/meta/main.yml                 |   0
 .../subversion}/tasks/main.yml                |   0
 .../synchronize}/files/bar.txt                |   0
 .../synchronize}/files/foo.txt                |   0
 .../synchronize}/meta/main.yml                |   0
 .../synchronize}/tasks/main.yml               |   0
 .../task_ordering}/tasks/main.yml             |   0
 .../tasks/taskorder-include.yml               |   0
 .../template}/files/foo-py26.txt              |   0
 .../template}/files/foo.txt                   |   0
 .../template}/meta/main.yml                   |   0
 .../template}/tasks/main.yml                  |   0
 .../template}/templates/foo.j2                |   0
 .../template}/templates/short.j2              |   0
 .../template}/vars/main.yml                   |   0
 .../unarchive}/files/foo.txt                  |   0
 .../test-unarchive-nonascii-くらとみ.tar.gz   | Bin
 .../unarchive}/meta/main.yml                  |   0
 .../unarchive}/tasks/main.yml                 |   0
 .../until}/tasks/main.yml                     |   0
 .../test_uri => targets/uri}/files/README     |   0
 .../test_uri => targets/uri}/files/fail0.json |   0
 .../test_uri => targets/uri}/files/fail1.json |   0
 .../uri}/files/fail10.json                    |   0
 .../uri}/files/fail11.json                    |   0
 .../uri}/files/fail12.json                    |   0
 .../uri}/files/fail13.json                    |   0
 .../uri}/files/fail14.json                    |   0
 .../uri}/files/fail15.json                    |   0
 .../uri}/files/fail16.json                    |   0
 .../uri}/files/fail17.json                    |   0
 .../uri}/files/fail18.json                    |   0
 .../uri}/files/fail19.json                    |   0
 .../test_uri => targets/uri}/files/fail2.json |   0
 .../uri}/files/fail20.json                    |   0
 .../uri}/files/fail21.json                    |   0
 .../uri}/files/fail22.json                    |   0
 .../uri}/files/fail23.json                    |   0
 .../uri}/files/fail24.json                    |   0
 .../uri}/files/fail25.json                    |   0
 .../uri}/files/fail26.json                    |   0
 .../uri}/files/fail27.json                    |   0
 .../uri}/files/fail28.json                    |   0
 .../uri}/files/fail29.json                    |   0
 .../test_uri => targets/uri}/files/fail3.json |   0
 .../uri}/files/fail30.json                    |   0
 .../test_uri => targets/uri}/files/fail4.json |   0
 .../test_uri => targets/uri}/files/fail5.json |   0
 .../test_uri => targets/uri}/files/fail6.json |   0
 .../test_uri => targets/uri}/files/fail7.json |   0
 .../test_uri => targets/uri}/files/fail8.json |   0
 .../test_uri => targets/uri}/files/fail9.json |   0
 .../test_uri => targets/uri}/files/pass0.json |   0
 .../test_uri => targets/uri}/files/pass1.json |   0
 .../test_uri => targets/uri}/files/pass2.json |   0
 .../test_uri => targets/uri}/files/pass3.json |   0
 .../test_uri => targets/uri}/files/pass4.json |   0
 .../uri}/files/testserver.py                  |   0
 .../test_uri => targets/uri}/meta/main.yml    |   0
 .../test_uri => targets/uri}/tasks/main.yml   |   0
 .../test_uri => targets/uri}/vars/main.yml    |   0
 .../test_yum => targets/yum}/meta/main.yml    |   0
 .../test_yum => targets/yum}/tasks/main.yml   |   0
 .../test_yum => targets/yum}/tasks/yum.yml    |   0
 .../zypper}/files/empty.spec                  |   0
 .../zypper}/meta/main.yml                     |   0
 .../zypper}/tasks/main.yml                    |   0
 .../zypper}/tasks/zypper.yml                  |   0
 .../zypper_repository}/meta/main.yml          |   0
 .../zypper_repository}/tasks/main.yml         |   0
 .../tasks/zypper_repository.yml               |   0
 263 files changed, 53 insertions(+), 53 deletions(-)
 rename test/integration/{roles/test_add_host => targets/add_host}/tasks/main.yml (100%)
 rename test/integration/{roles/test_apache2_module => targets/apache2_module}/meta/main.yml (100%)
 rename test/integration/{roles/test_apache2_module => targets/apache2_module}/tasks/actualtest.yml (100%)
 rename test/integration/{roles/test_apache2_module => targets/apache2_module}/tasks/main.yml (100%)
 rename test/integration/{roles/test_apt => targets/apt}/meta/main.yml (100%)
 rename test/integration/{roles/test_apt => targets/apt}/tasks/apt-builddep.yml (100%)
 rename test/integration/{roles/test_apt => targets/apt}/tasks/apt.yml (100%)
 rename test/integration/{roles/test_apt => targets/apt}/tasks/main.yml (100%)
 rename test/integration/{roles/test_apt_repository => targets/apt_repository}/meta/main.yml (100%)
 rename test/integration/{roles/test_apt_repository => targets/apt_repository}/tasks/apt.yml (100%)
 rename test/integration/{roles/test_apt_repository => targets/apt_repository}/tasks/cleanup.yml (100%)
 rename test/integration/{roles/test_apt_repository => targets/apt_repository}/tasks/main.yml (100%)
 rename test/integration/{roles/test_assemble => targets/assemble}/files/fragment1 (100%)
 rename test/integration/{roles/test_assemble => targets/assemble}/files/fragment2 (100%)
 rename test/integration/{roles/test_assemble => targets/assemble}/files/fragment3 (100%)
 rename test/integration/{roles/test_assemble => targets/assemble}/files/fragment4 (100%)
 rename test/integration/{roles/test_assemble => targets/assemble}/files/fragment5 (100%)
 rename test/integration/{roles/test_assemble => targets/assemble}/meta/main.yml (100%)
 rename test/integration/{roles/test_assemble => targets/assemble}/tasks/main.yml (100%)
 rename test/integration/{roles/test_async => targets/async}/library/async_test.py (100%)
 rename test/integration/{roles/test_async => targets/async}/meta/main.yml (100%)
 rename test/integration/{roles/test_async => targets/async}/tasks/main.yml (100%)
 rename test/integration/{roles/test_authorized_key => targets/authorized_key}/defaults/main.yml (100%)
 rename test/integration/{roles/test_authorized_key => targets/authorized_key}/meta/main.yml (100%)
 rename test/integration/{roles/test_authorized_key => targets/authorized_key}/tasks/main.yml (100%)
 rename test/integration/{roles/test_become => targets/become}/files/baz.txt (100%)
 rename test/integration/{roles/test_become => targets/become}/tasks/main.yml (100%)
 rename test/integration/{roles/test_become => targets/become}/templates/bar.j2 (100%)
 rename test/integration/{roles/test_become => targets/become}/vars/default.yml (100%)
 rename test/integration/{roles/test_binary => targets/binary}/files/b64_latin1 (100%)
 rename test/integration/{roles/test_binary => targets/binary}/files/b64_utf8 (100%)
 rename test/integration/{roles/test_binary => targets/binary}/files/from_playbook (100%)
 rename test/integration/{roles/test_binary => targets/binary}/meta/main.yml (100%)
 rename test/integration/{roles/test_binary => targets/binary}/tasks/main.yml (100%)
 rename test/integration/{roles/test_binary => targets/binary}/templates/b64_latin1_template.j2 (100%)
 rename test/integration/{roles/test_binary => targets/binary}/templates/b64_utf8_template.j2 (100%)
 rename test/integration/{roles/test_binary => targets/binary}/templates/from_playbook_template.j2 (100%)
 rename test/integration/{roles/test_binary => targets/binary}/vars/main.yml (100%)
 rename test/integration/{roles/test_changed_when => targets/changed_when}/meta/main.yml (100%)
 rename test/integration/{roles/test_changed_when => targets/changed_when}/tasks/main.yml (100%)
 rename test/integration/{roles/test_command_shell => targets/command_shell}/files/create_afile.sh (100%)
 rename test/integration/{roles/test_command_shell => targets/command_shell}/files/remove_afile.sh (100%)
 rename test/integration/{roles/test_command_shell => targets/command_shell}/files/test.sh (100%)
 rename test/integration/{roles/test_command_shell => targets/command_shell}/meta/main.yml (100%)
 rename test/integration/{roles/test_command_shell => targets/command_shell}/tasks/main.yml (100%)
 rename test/integration/{roles/test_conditionals => targets/conditionals}/tasks/main.yml (100%)
 rename test/integration/{roles/test_conditionals => targets/conditionals}/vars/main.yml (100%)
 rename test/integration/{roles/test_copy => targets/copy}/files/foo.txt (100%)
 rename test/integration/{roles/test_copy => targets/copy}/files/subdir/bar.txt (100%)
 rename test/integration/{roles/test_copy => targets/copy}/files/subdir/subdir2/baz.txt (100%)
 rename test/integration/{roles/test_copy => targets/copy}/files/subdir/subdir2/subdir3/subdir4/qux.txt (100%)
 rename test/integration/{roles/test_copy => targets/copy}/meta/main.yml (100%)
 rename test/integration/{roles/test_copy => targets/copy}/tasks/main.yml (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/devdockerCA.crt (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/devdockerCA.key (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/devdockerCA.srl (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/docker-registry.htpasswd (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/dockertest.ansible.com.crt (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/dockertest.ansible.com.csr (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/dockertest.ansible.com.key (100%)
 rename test/integration/{roles/test_docker => targets/docker}/files/nginx-docker-registry.conf (100%)
 rename test/integration/{roles/test_docker => targets/docker}/meta/main.yml (100%)
 rename test/integration/{roles/test_docker => targets/docker}/tasks/docker-setup-debian.yml (100%)
 rename test/integration/{roles/test_docker => targets/docker}/tasks/docker-setup-rht.yml (100%)
 rename test/integration/{roles/test_docker => targets/docker}/tasks/docker-tests.yml (100%)
 rename test/integration/{roles/test_docker => targets/docker}/tasks/main.yml (100%)
 rename test/integration/{roles/test_docker => targets/docker}/tasks/registry-tests.yml (100%)
 rename test/integration/{roles/test_embedded_module => targets/embedded_module}/library/test_integration_module (100%)
 rename test/integration/{roles/test_embedded_module => targets/embedded_module}/tasks/main.yml (100%)
 rename test/integration/{roles/test_facts_d => targets/facts_d}/meta/main.yml (100%)
 rename test/integration/{roles/test_facts_d => targets/facts_d}/tasks/main.yml (100%)
 rename test/integration/{roles/test_failed_when => targets/failed_when}/tasks/main.yml (100%)
 rename test/integration/{roles/test_fetch => targets/fetch}/meta/main.yml (100%)
 rename test/integration/{roles/test_fetch => targets/fetch}/tasks/main.yml (100%)
 rename test/integration/{roles/test_file => targets/file}/files/foo.txt (100%)
 rename test/integration/{roles/test_file => targets/file}/files/foobar/directory/fileC (100%)
 rename test/integration/{roles/test_file => targets/file}/files/foobar/directory/fileD (100%)
 rename test/integration/{roles/test_file => targets/file}/files/foobar/fileA (100%)
 rename test/integration/{roles/test_file => targets/file}/files/foobar/fileB (100%)
 rename test/integration/{roles/test_file => targets/file}/meta/main.yml (100%)
 rename test/integration/{roles/test_file => targets/file}/tasks/main.yml (100%)
 rename test/integration/{roles/test_file => targets/file}/tasks/selinux_tests.yml (100%)
 rename test/integration/{roles/test_filters => targets/filters}/files/9851.txt (100%)
 rename test/integration/{roles/test_filters => targets/filters}/files/foo.txt (100%)
 rename test/integration/{roles/test_filters => targets/filters}/meta/main.yml (100%)
 rename test/integration/{roles/test_filters => targets/filters}/tasks/main.yml (100%)
 rename test/integration/{roles/test_filters => targets/filters}/templates/foo.j2 (100%)
 rename test/integration/{roles/test_filters => targets/filters}/templates/py26json.j2 (100%)
 rename test/integration/{roles/test_filters => targets/filters}/vars/main.yml (100%)
 rename test/integration/{roles/test_gem => targets/gem}/meta/main.yml (100%)
 rename test/integration/{roles/test_gem => targets/gem}/tasks/main.yml (100%)
 rename test/integration/{roles/test_get_url => targets/get_url}/meta/main.yml (100%)
 rename test/integration/{roles/test_get_url => targets/get_url}/tasks/main.yml (100%)
 rename test/integration/{roles/test_git => targets/git}/meta/main.yml (100%)
 rename test/integration/{roles/test_git => targets/git}/tasks/main.yml (100%)
 rename test/integration/{roles/test_hg => targets/hg}/meta/main.yml (100%)
 rename test/integration/{roles/test_hg => targets/hg}/tasks/main.yml (100%)
 rename test/integration/{roles/test_ignore_errors => targets/ignore_errors}/meta/main.yml (100%)
 rename test/integration/{roles/test_ignore_errors => targets/ignore_errors}/tasks/main.yml (100%)
 rename test/integration/{roles/test_include_vars => targets/include_vars}/defaults/main.yml (100%)
 rename test/integration/{roles/test_include_vars => targets/include_vars}/tasks/main.yml (100%)
 rename test/integration/{roles/test_include_vars => targets/include_vars}/vars/all/all.yml (100%)
 rename test/integration/{roles/test_include_vars => targets/include_vars}/vars/environments/development/all.yml (100%)
 rename test/integration/{roles/test_include_vars => targets/include_vars}/vars/environments/development/services/webapp.yml (100%)
 rename test/integration/{roles/test_include_vars => targets/include_vars}/vars/services/webapp.yml (100%)
 rename test/integration/{roles/test_iterators => targets/iterators}/meta/main.yml (100%)
 rename test/integration/{roles/test_iterators => targets/iterators}/tasks/main.yml (100%)
 rename test/integration/{roles/test_iterators => targets/iterators}/vars/main.yml (100%)
 rename test/integration/{roles/test_lineinfile => targets/lineinfile}/files/test.txt (100%)
 rename test/integration/{roles/test_lineinfile => targets/lineinfile}/files/testempty.txt (100%)
 rename test/integration/{roles/test_lineinfile => targets/lineinfile}/files/testnoeof.txt (100%)
 rename test/integration/{roles/test_lineinfile => targets/lineinfile}/meta/main.yml (100%)
 rename test/integration/{roles/test_lineinfile => targets/lineinfile}/tasks/main.yml (100%)
 rename test/integration/{roles/test_lookups => targets/lookups}/meta/main.yml (100%)
 rename test/integration/{roles/test_lookups => targets/lookups}/tasks/main.yml (100%)
 rename test/integration/{roles/test_lookups => targets/lookups}/vars/main.yml (100%)
 rename test/integration/{roles/test_loops => targets/loops}/tasks/main.yml (100%)
 rename test/integration/{roles/test_mount => targets/mount}/tasks/main.yml (100%)
 rename test/integration/{roles/test_mysql_db => targets/mysql_db}/defaults/main.yml (100%)
 rename test/integration/{roles/test_mysql_db => targets/mysql_db}/meta/main.yml (100%)
 rename test/integration/{roles/test_mysql_db => targets/mysql_db}/tasks/main.yml (100%)
 rename test/integration/{roles/test_mysql_db => targets/mysql_db}/tasks/state_dump_import.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/defaults/main.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/meta/main.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/tasks/assert_no_user.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/tasks/assert_user.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/tasks/create_user.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/tasks/main.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/tasks/remove_user.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/tasks/test_privs.yml (100%)
 rename test/integration/{roles/test_mysql_user => targets/mysql_user}/tasks/user_password_update_test.yml (100%)
 rename test/integration/{roles/test_mysql_variables => targets/mysql_variables}/defaults/main.yml (100%)
 rename test/integration/{roles/test_mysql_variables => targets/mysql_variables}/meta/main.yml (100%)
 rename test/integration/{roles/test_mysql_variables => targets/mysql_variables}/tasks/assert_fail_msg.yml (100%)
 rename test/integration/{roles/test_mysql_variables => targets/mysql_variables}/tasks/assert_var.yml (100%)
 rename test/integration/{roles/test_mysql_variables => targets/mysql_variables}/tasks/assert_var_output.yml (100%)
 rename test/integration/{roles/test_mysql_variables => targets/mysql_variables}/tasks/main.yml (100%)
 rename test/integration/{roles/test_ping => targets/ping}/tasks/main.yml (100%)
 rename test/integration/{roles/test_pip => targets/pip}/meta/main.yml (100%)
 rename test/integration/{roles/test_pip => targets/pip}/tasks/main.yml (100%)
 rename test/integration/{roles/test_pip => targets/pip}/tasks/pip.yml (100%)
 rename test/integration/{roles/test_postgresql => targets/postgresql}/defaults/main.yml (100%)
 rename test/integration/{roles/test_postgresql => targets/postgresql}/meta/main.yml (100%)
 rename test/integration/{roles/test_postgresql => targets/postgresql}/tasks/main.yml (100%)
 rename test/integration/{roles => targets}/prepare_http_tests/defaults/main.yml (100%)
 rename test/integration/{roles => targets}/prepare_http_tests/tasks/main.yml (100%)
 rename test/integration/{roles => targets}/prepare_http_tests/vars/httptester.yml (100%)
 rename test/integration/{roles/test_service/templates => targets/prepare_tests/tasks}/main.yml (100%)
 rename test/integration/{roles/test_script => targets/script}/files/create_afile.sh (100%)
 rename test/integration/{roles/test_script => targets/script}/files/remove_afile.sh (100%)
 rename test/integration/{roles/test_script => targets/script}/files/test.sh (100%)
 rename test/integration/{roles/test_script => targets/script}/meta/main.yml (100%)
 rename test/integration/{roles/test_script => targets/script}/tasks/main.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/files/ansible-broken.upstart (100%)
 rename test/integration/{roles/test_service => targets/service}/files/ansible.systemd (100%)
 rename test/integration/{roles/test_service => targets/service}/files/ansible.sysv (100%)
 rename test/integration/{roles/test_service => targets/service}/files/ansible.upstart (100%)
 rename test/integration/{roles/test_service => targets/service}/files/ansible_test_service (100%)
 rename test/integration/{roles/test_service => targets/service}/meta/main.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/tasks/main.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/tasks/systemd_cleanup.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/tasks/systemd_setup.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/tasks/sysv_cleanup.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/tasks/sysv_setup.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/tasks/upstart_cleanup.yml (100%)
 rename test/integration/{roles/test_service => targets/service}/tasks/upstart_setup.yml (100%)
 rename test/integration/{roles/test_special_vars/vars => targets/service/templates}/main.yml (100%)
 rename test/integration/{roles => targets}/setup_mysql_db/defaults/main.yml (100%)
 rename test/integration/{roles => targets}/setup_mysql_db/tasks/main.yml (100%)
 rename test/integration/{roles => targets}/setup_mysql_db/vars/Debian.yml (100%)
 rename test/integration/{roles => targets}/setup_mysql_db/vars/Fedora.yml (100%)
 rename test/integration/{roles => targets}/setup_mysql_db/vars/RedHat-7.yml (100%)
 rename test/integration/{roles => targets}/setup_mysql_db/vars/RedHat.yml (100%)
 rename test/integration/{roles => targets}/setup_mysql_db/vars/Suse.yml (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/defaults/main.yml (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/files/pg_hba.conf (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/tasks/main.yml (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/vars/Debian-8.yml (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/vars/Ubuntu-12.yml (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/vars/Ubuntu-14.yml (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/vars/Ubuntu-16.yml (100%)
 rename test/integration/{roles => targets}/setup_postgresql_db/vars/default.yml (100%)
 rename test/integration/{roles/test_special_vars => targets/special_vars}/meta/main.yml (100%)
 rename test/integration/{roles/test_special_vars => targets/special_vars}/tasks/main.yml (100%)
 rename test/integration/{roles/test_special_vars => targets/special_vars}/templates/foo.j2 (100%)
 create mode 100644 test/integration/targets/special_vars/vars/main.yml
 rename test/integration/{roles/test_stat => targets/stat}/files/foo.txt (100%)
 rename test/integration/{roles/test_stat => targets/stat}/meta/main.yml (100%)
 rename test/integration/{roles/test_stat => targets/stat}/tasks/main.yml (100%)
 rename test/integration/{roles/test_subversion => targets/subversion}/meta/main.yml (100%)
 rename test/integration/{roles/test_subversion => targets/subversion}/tasks/main.yml (100%)
 rename test/integration/{roles/test_synchronize => targets/synchronize}/files/bar.txt (100%)
 rename test/integration/{roles/test_synchronize => targets/synchronize}/files/foo.txt (100%)
 rename test/integration/{roles/test_synchronize => targets/synchronize}/meta/main.yml (100%)
 rename test/integration/{roles/test_synchronize => targets/synchronize}/tasks/main.yml (100%)
 rename test/integration/{roles/test_task_ordering => targets/task_ordering}/tasks/main.yml (100%)
 rename test/integration/{roles/test_task_ordering => targets/task_ordering}/tasks/taskorder-include.yml (100%)
 rename test/integration/{roles/test_template => targets/template}/files/foo-py26.txt (100%)
 rename test/integration/{roles/test_template => targets/template}/files/foo.txt (100%)
 rename test/integration/{roles/test_template => targets/template}/meta/main.yml (100%)
 rename test/integration/{roles/test_template => targets/template}/tasks/main.yml (100%)
 rename test/integration/{roles/test_template => targets/template}/templates/foo.j2 (100%)
 rename test/integration/{roles/test_template => targets/template}/templates/short.j2 (100%)
 rename test/integration/{roles/test_template => targets/template}/vars/main.yml (100%)
 rename test/integration/{roles/test_unarchive => targets/unarchive}/files/foo.txt (100%)
 rename test/integration/{roles/test_unarchive => targets/unarchive}/files/test-unarchive-nonascii-くらとみ.tar.gz (100%)
 rename test/integration/{roles/test_unarchive => targets/unarchive}/meta/main.yml (100%)
 rename test/integration/{roles/test_unarchive => targets/unarchive}/tasks/main.yml (100%)
 rename test/integration/{roles/test_until => targets/until}/tasks/main.yml (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/README (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail0.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail1.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail10.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail11.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail12.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail13.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail14.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail15.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail16.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail17.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail18.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail19.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail2.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail20.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail21.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail22.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail23.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail24.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail25.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail26.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail27.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail28.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail29.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail3.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail30.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail4.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail5.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail6.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail7.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail8.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/fail9.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/pass0.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/pass1.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/pass2.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/pass3.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/pass4.json (100%)
 rename test/integration/{roles/test_uri => targets/uri}/files/testserver.py (100%)
 rename test/integration/{roles/test_uri => targets/uri}/meta/main.yml (100%)
 rename test/integration/{roles/test_uri => targets/uri}/tasks/main.yml (100%)
 rename test/integration/{roles/test_uri => targets/uri}/vars/main.yml (100%)
 rename test/integration/{roles/test_yum => targets/yum}/meta/main.yml (100%)
 rename test/integration/{roles/test_yum => targets/yum}/tasks/main.yml (100%)
 rename test/integration/{roles/test_yum => targets/yum}/tasks/yum.yml (100%)
 rename test/integration/{roles/test_zypper => targets/zypper}/files/empty.spec (100%)
 rename test/integration/{roles/test_zypper => targets/zypper}/meta/main.yml (100%)
 rename test/integration/{roles/test_zypper => targets/zypper}/tasks/main.yml (100%)
 rename test/integration/{roles/test_zypper => targets/zypper}/tasks/zypper.yml (100%)
 rename test/integration/{roles/test_zypper_repository => targets/zypper_repository}/meta/main.yml (100%)
 rename test/integration/{roles/test_zypper_repository => targets/zypper_repository}/tasks/main.yml (100%)
 rename test/integration/{roles/test_zypper_repository => targets/zypper_repository}/tasks/zypper_repository.yml (100%)

diff --git a/test/integration/Makefile b/test/integration/Makefile
index 207a20f4d4..c52c072729 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -64,7 +64,7 @@ environment:
 	(cd targets/environment && ./runme.sh $(TEST_FLAGS))
 
 non_destructive: setup
-	ansible-playbook non_destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
+	ANSIBLE_ROLES_PATH=targets ansible-playbook non_destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
 
 # Tests which can be run when running as root and a local SSH daemon is available.
 test_root_ssh: test_connection_local test_connection_chroot test_connection_ssh test_connection_paramiko_ssh test_delegate_to
@@ -135,7 +135,7 @@ test_connection_winrm:
 	(cd targets/connection_winrm && ./runme.sh $(TEST_FLAGS))
 
 destructive: setup
-	ansible-playbook destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
+	ANSIBLE_ROLES_PATH=targets ansible-playbook destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
 
 check_mode:
 	(cd targets/check_mode && ./runme.sh $(TEST_FLAGS))
diff --git a/test/integration/destructive.yml b/test/integration/destructive.yml
index ee858e01e1..ad03a6efdf 100644
--- a/test/integration/destructive.yml
+++ b/test/integration/destructive.yml
@@ -2,22 +2,22 @@
   gather_facts: True
   roles:
     # In destructive because it creates and removes a user
-    - { role: test_become, tags: test_become}
-    - { role: test_service, tags: [test_service, needs_privileged] }
-    - { role: test_pip, tags: test_pip }
-    - { role: test_gem, tags: test_gem }
-    - { role: test_yum, tags: test_yum }
-    - { role: test_apt, tags: test_apt }
-    - { role: test_apt_repository, tags: [test_apt_repository, test_apt_key] }
-    - { role: test_postgresql, tags: [test_postgresql, test_postgresql_db, test_postgresql_privs, test_postgresql_user, needs_privileged] }
-    - { role: test_mysql_db, tags: test_mysql_db}
-    - { role: test_mysql_user, tags: test_mysql_user}
-    - { role: test_mysql_variables, tags: test_mysql_variables}
-    - { role: test_docker, tags: test_docker }
-    - { role: test_zypper, tags: test_zypper}
-    - { role: test_zypper_repository, tags: test_zypper_repository}
-    - { role: test_uri, tags: test_uri }
-    - { role: test_get_url, tags: test_get_url }
-    - { role: test_apache2_module, tags: test_apache2_module }
+    - { role: become, tags: test_become}
+    - { role: service, tags: [test_service, needs_privileged] }
+    - { role: pip, tags: test_pip }
+    - { role: gem, tags: test_gem }
+    - { role: yum, tags: test_yum }
+    - { role: apt, tags: test_apt }
+    - { role: apt_repository, tags: [test_apt_repository, test_apt_key] }
+    - { role: postgresql, tags: [test_postgresql, test_postgresql_db, test_postgresql_privs, test_postgresql_user, needs_privileged] }
+    - { role: mysql_db, tags: test_mysql_db}
+    - { role: mysql_user, tags: test_mysql_user}
+    - { role: mysql_variables, tags: test_mysql_variables}
+    - { role: docker, tags: test_docker }
+    - { role: zypper, tags: test_zypper}
+    - { role: zypper_repository, tags: test_zypper_repository}
+    - { role: uri, tags: test_uri }
+    - { role: get_url, tags: test_get_url }
+    - { role: apache2_module, tags: test_apache2_module }
     # This removes ~/.ssh/known_hosts and /etc/ssh/known_hosts
-    - { role: test_git, tags: test_git }
+    - { role: git, tags: test_git }
diff --git a/test/integration/non_destructive.yml b/test/integration/non_destructive.yml
index 11caccbf90..e44bcdae72 100644
--- a/test/integration/non_destructive.yml
+++ b/test/integration/non_destructive.yml
@@ -1,36 +1,36 @@
 - hosts: testhost
   gather_facts: True
   roles: 
-    - { role: test_ping, tags: test_ping }
-    - { role: test_special_vars, tags: test_special_vars }
-    - { role: test_ignore_errors, tags: test_ignore_errors }
-    - { role: test_conditionals, tags: test_conditionals }
-    - { role: test_iterators, tags: test_iterators }
-    - { role: test_lookups, tags: test_lookups }
-    - { role: test_changed_when, tags: test_changed_when }
-    - { role: test_failed_when, tags: test_failed_when }
-    - { role: test_until, tags: test_until }
-    - { role: test_copy, tags: test_copy }
-    - { role: test_stat, tags: test_stat }
-    - { role: test_template, tags: test_template }
-    - { role: test_file, tags: test_file }
-    - { role: test_fetch, tags: test_fetch }
-    - { role: test_synchronize, tags: test_synchronize }
-    - { role: test_assemble, tags: test_assemble }
-    - { role: test_subversion, tags: test_subversion }
-    - { role: test_hg, tags: test_hg }
-    - { role: test_lineinfile, tags: test_lineinfile }
-    - { role: test_unarchive, tags: test_unarchive }
-    - { role: test_filters, tags: test_filters }
-    - { role: test_facts_d, tags: test_facts_d }
-    - { role: test_async, tags: [test_async, test_async_status, test_async_wrapper] }
-    - { role: test_command_shell, tags: [test_command_shell, test_command, test_shell] }
-    - { role: test_task_ordering, tags: test_task_ordering }
-    - { role: test_script, tags: test_script }
-    - { role: test_authorized_key, tags: test_authorized_key }
-    - { role: test_embedded_module, tags: test_embedded_module }
-    - { role: test_add_host, tags: test_add_host }
-    - { role: test_binary, tags: test_binary }
-    - { role: test_loops, tags: test_loops }
-    - { role: test_mount, tags: [test_mount, needs_root, needs_privileged]}
-    - { role: test_include_vars, tags: test_include_vars }
+    - { role: ping, tags: test_ping }
+    - { role: special_vars, tags: test_special_vars }
+    - { role: ignore_errors, tags: test_ignore_errors }
+    - { role: conditionals, tags: test_conditionals }
+    - { role: iterators, tags: test_iterators }
+    - { role: lookups, tags: test_lookups }
+    - { role: changed_when, tags: test_changed_when }
+    - { role: failed_when, tags: test_failed_when }
+    - { role: until, tags: test_until }
+    - { role: copy, tags: test_copy }
+    - { role: stat, tags: test_stat }
+    - { role: template, tags: test_template }
+    - { role: file, tags: test_file }
+    - { role: fetch, tags: test_fetch }
+    - { role: synchronize, tags: test_synchronize }
+    - { role: assemble, tags: test_assemble }
+    - { role: subversion, tags: test_subversion }
+    - { role: hg, tags: test_hg }
+    - { role: lineinfile, tags: test_lineinfile }
+    - { role: unarchive, tags: test_unarchive }
+    - { role: filters, tags: test_filters }
+    - { role: facts_d, tags: test_facts_d }
+    - { role: async, tags: [test_async, test_async_status, test_async_wrapper] }
+    - { role: command_shell, tags: [test_command_shell, test_command, test_shell] }
+    - { role: task_ordering, tags: test_task_ordering }
+    - { role: script, tags: test_script }
+    - { role: authorized_key, tags: test_authorized_key }
+    - { role: embedded_module, tags: test_embedded_module }
+    - { role: add_host, tags: test_add_host }
+    - { role: binary, tags: test_binary }
+    - { role: loops, tags: test_loops }
+    - { role: mount, tags: [test_mount, needs_root, needs_privileged]}
+    - { role: include_vars, tags: test_include_vars }
diff --git a/test/integration/roles/test_add_host/tasks/main.yml b/test/integration/targets/add_host/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_add_host/tasks/main.yml
rename to test/integration/targets/add_host/tasks/main.yml
diff --git a/test/integration/roles/test_apache2_module/meta/main.yml b/test/integration/targets/apache2_module/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_apache2_module/meta/main.yml
rename to test/integration/targets/apache2_module/meta/main.yml
diff --git a/test/integration/roles/test_apache2_module/tasks/actualtest.yml b/test/integration/targets/apache2_module/tasks/actualtest.yml
similarity index 100%
rename from test/integration/roles/test_apache2_module/tasks/actualtest.yml
rename to test/integration/targets/apache2_module/tasks/actualtest.yml
diff --git a/test/integration/roles/test_apache2_module/tasks/main.yml b/test/integration/targets/apache2_module/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_apache2_module/tasks/main.yml
rename to test/integration/targets/apache2_module/tasks/main.yml
diff --git a/test/integration/roles/test_apt/meta/main.yml b/test/integration/targets/apt/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_apt/meta/main.yml
rename to test/integration/targets/apt/meta/main.yml
diff --git a/test/integration/roles/test_apt/tasks/apt-builddep.yml b/test/integration/targets/apt/tasks/apt-builddep.yml
similarity index 100%
rename from test/integration/roles/test_apt/tasks/apt-builddep.yml
rename to test/integration/targets/apt/tasks/apt-builddep.yml
diff --git a/test/integration/roles/test_apt/tasks/apt.yml b/test/integration/targets/apt/tasks/apt.yml
similarity index 100%
rename from test/integration/roles/test_apt/tasks/apt.yml
rename to test/integration/targets/apt/tasks/apt.yml
diff --git a/test/integration/roles/test_apt/tasks/main.yml b/test/integration/targets/apt/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_apt/tasks/main.yml
rename to test/integration/targets/apt/tasks/main.yml
diff --git a/test/integration/roles/test_apt_repository/meta/main.yml b/test/integration/targets/apt_repository/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_apt_repository/meta/main.yml
rename to test/integration/targets/apt_repository/meta/main.yml
diff --git a/test/integration/roles/test_apt_repository/tasks/apt.yml b/test/integration/targets/apt_repository/tasks/apt.yml
similarity index 100%
rename from test/integration/roles/test_apt_repository/tasks/apt.yml
rename to test/integration/targets/apt_repository/tasks/apt.yml
diff --git a/test/integration/roles/test_apt_repository/tasks/cleanup.yml b/test/integration/targets/apt_repository/tasks/cleanup.yml
similarity index 100%
rename from test/integration/roles/test_apt_repository/tasks/cleanup.yml
rename to test/integration/targets/apt_repository/tasks/cleanup.yml
diff --git a/test/integration/roles/test_apt_repository/tasks/main.yml b/test/integration/targets/apt_repository/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_apt_repository/tasks/main.yml
rename to test/integration/targets/apt_repository/tasks/main.yml
diff --git a/test/integration/roles/test_assemble/files/fragment1 b/test/integration/targets/assemble/files/fragment1
similarity index 100%
rename from test/integration/roles/test_assemble/files/fragment1
rename to test/integration/targets/assemble/files/fragment1
diff --git a/test/integration/roles/test_assemble/files/fragment2 b/test/integration/targets/assemble/files/fragment2
similarity index 100%
rename from test/integration/roles/test_assemble/files/fragment2
rename to test/integration/targets/assemble/files/fragment2
diff --git a/test/integration/roles/test_assemble/files/fragment3 b/test/integration/targets/assemble/files/fragment3
similarity index 100%
rename from test/integration/roles/test_assemble/files/fragment3
rename to test/integration/targets/assemble/files/fragment3
diff --git a/test/integration/roles/test_assemble/files/fragment4 b/test/integration/targets/assemble/files/fragment4
similarity index 100%
rename from test/integration/roles/test_assemble/files/fragment4
rename to test/integration/targets/assemble/files/fragment4
diff --git a/test/integration/roles/test_assemble/files/fragment5 b/test/integration/targets/assemble/files/fragment5
similarity index 100%
rename from test/integration/roles/test_assemble/files/fragment5
rename to test/integration/targets/assemble/files/fragment5
diff --git a/test/integration/roles/test_assemble/meta/main.yml b/test/integration/targets/assemble/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_assemble/meta/main.yml
rename to test/integration/targets/assemble/meta/main.yml
diff --git a/test/integration/roles/test_assemble/tasks/main.yml b/test/integration/targets/assemble/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_assemble/tasks/main.yml
rename to test/integration/targets/assemble/tasks/main.yml
diff --git a/test/integration/roles/test_async/library/async_test.py b/test/integration/targets/async/library/async_test.py
similarity index 100%
rename from test/integration/roles/test_async/library/async_test.py
rename to test/integration/targets/async/library/async_test.py
diff --git a/test/integration/roles/test_async/meta/main.yml b/test/integration/targets/async/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_async/meta/main.yml
rename to test/integration/targets/async/meta/main.yml
diff --git a/test/integration/roles/test_async/tasks/main.yml b/test/integration/targets/async/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_async/tasks/main.yml
rename to test/integration/targets/async/tasks/main.yml
diff --git a/test/integration/roles/test_authorized_key/defaults/main.yml b/test/integration/targets/authorized_key/defaults/main.yml
similarity index 100%
rename from test/integration/roles/test_authorized_key/defaults/main.yml
rename to test/integration/targets/authorized_key/defaults/main.yml
diff --git a/test/integration/roles/test_authorized_key/meta/main.yml b/test/integration/targets/authorized_key/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_authorized_key/meta/main.yml
rename to test/integration/targets/authorized_key/meta/main.yml
diff --git a/test/integration/roles/test_authorized_key/tasks/main.yml b/test/integration/targets/authorized_key/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_authorized_key/tasks/main.yml
rename to test/integration/targets/authorized_key/tasks/main.yml
diff --git a/test/integration/roles/test_become/files/baz.txt b/test/integration/targets/become/files/baz.txt
similarity index 100%
rename from test/integration/roles/test_become/files/baz.txt
rename to test/integration/targets/become/files/baz.txt
diff --git a/test/integration/roles/test_become/tasks/main.yml b/test/integration/targets/become/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_become/tasks/main.yml
rename to test/integration/targets/become/tasks/main.yml
diff --git a/test/integration/roles/test_become/templates/bar.j2 b/test/integration/targets/become/templates/bar.j2
similarity index 100%
rename from test/integration/roles/test_become/templates/bar.j2
rename to test/integration/targets/become/templates/bar.j2
diff --git a/test/integration/roles/test_become/vars/default.yml b/test/integration/targets/become/vars/default.yml
similarity index 100%
rename from test/integration/roles/test_become/vars/default.yml
rename to test/integration/targets/become/vars/default.yml
diff --git a/test/integration/roles/test_binary/files/b64_latin1 b/test/integration/targets/binary/files/b64_latin1
similarity index 100%
rename from test/integration/roles/test_binary/files/b64_latin1
rename to test/integration/targets/binary/files/b64_latin1
diff --git a/test/integration/roles/test_binary/files/b64_utf8 b/test/integration/targets/binary/files/b64_utf8
similarity index 100%
rename from test/integration/roles/test_binary/files/b64_utf8
rename to test/integration/targets/binary/files/b64_utf8
diff --git a/test/integration/roles/test_binary/files/from_playbook b/test/integration/targets/binary/files/from_playbook
similarity index 100%
rename from test/integration/roles/test_binary/files/from_playbook
rename to test/integration/targets/binary/files/from_playbook
diff --git a/test/integration/roles/test_binary/meta/main.yml b/test/integration/targets/binary/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_binary/meta/main.yml
rename to test/integration/targets/binary/meta/main.yml
diff --git a/test/integration/roles/test_binary/tasks/main.yml b/test/integration/targets/binary/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_binary/tasks/main.yml
rename to test/integration/targets/binary/tasks/main.yml
diff --git a/test/integration/roles/test_binary/templates/b64_latin1_template.j2 b/test/integration/targets/binary/templates/b64_latin1_template.j2
similarity index 100%
rename from test/integration/roles/test_binary/templates/b64_latin1_template.j2
rename to test/integration/targets/binary/templates/b64_latin1_template.j2
diff --git a/test/integration/roles/test_binary/templates/b64_utf8_template.j2 b/test/integration/targets/binary/templates/b64_utf8_template.j2
similarity index 100%
rename from test/integration/roles/test_binary/templates/b64_utf8_template.j2
rename to test/integration/targets/binary/templates/b64_utf8_template.j2
diff --git a/test/integration/roles/test_binary/templates/from_playbook_template.j2 b/test/integration/targets/binary/templates/from_playbook_template.j2
similarity index 100%
rename from test/integration/roles/test_binary/templates/from_playbook_template.j2
rename to test/integration/targets/binary/templates/from_playbook_template.j2
diff --git a/test/integration/roles/test_binary/vars/main.yml b/test/integration/targets/binary/vars/main.yml
similarity index 100%
rename from test/integration/roles/test_binary/vars/main.yml
rename to test/integration/targets/binary/vars/main.yml
diff --git a/test/integration/roles/test_changed_when/meta/main.yml b/test/integration/targets/changed_when/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_changed_when/meta/main.yml
rename to test/integration/targets/changed_when/meta/main.yml
diff --git a/test/integration/roles/test_changed_when/tasks/main.yml b/test/integration/targets/changed_when/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_changed_when/tasks/main.yml
rename to test/integration/targets/changed_when/tasks/main.yml
diff --git a/test/integration/roles/test_command_shell/files/create_afile.sh b/test/integration/targets/command_shell/files/create_afile.sh
similarity index 100%
rename from test/integration/roles/test_command_shell/files/create_afile.sh
rename to test/integration/targets/command_shell/files/create_afile.sh
diff --git a/test/integration/roles/test_command_shell/files/remove_afile.sh b/test/integration/targets/command_shell/files/remove_afile.sh
similarity index 100%
rename from test/integration/roles/test_command_shell/files/remove_afile.sh
rename to test/integration/targets/command_shell/files/remove_afile.sh
diff --git a/test/integration/roles/test_command_shell/files/test.sh b/test/integration/targets/command_shell/files/test.sh
similarity index 100%
rename from test/integration/roles/test_command_shell/files/test.sh
rename to test/integration/targets/command_shell/files/test.sh
diff --git a/test/integration/roles/test_command_shell/meta/main.yml b/test/integration/targets/command_shell/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_command_shell/meta/main.yml
rename to test/integration/targets/command_shell/meta/main.yml
diff --git a/test/integration/roles/test_command_shell/tasks/main.yml b/test/integration/targets/command_shell/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_command_shell/tasks/main.yml
rename to test/integration/targets/command_shell/tasks/main.yml
diff --git a/test/integration/roles/test_conditionals/tasks/main.yml b/test/integration/targets/conditionals/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_conditionals/tasks/main.yml
rename to test/integration/targets/conditionals/tasks/main.yml
diff --git a/test/integration/roles/test_conditionals/vars/main.yml b/test/integration/targets/conditionals/vars/main.yml
similarity index 100%
rename from test/integration/roles/test_conditionals/vars/main.yml
rename to test/integration/targets/conditionals/vars/main.yml
diff --git a/test/integration/roles/test_copy/files/foo.txt b/test/integration/targets/copy/files/foo.txt
similarity index 100%
rename from test/integration/roles/test_copy/files/foo.txt
rename to test/integration/targets/copy/files/foo.txt
diff --git a/test/integration/roles/test_copy/files/subdir/bar.txt b/test/integration/targets/copy/files/subdir/bar.txt
similarity index 100%
rename from test/integration/roles/test_copy/files/subdir/bar.txt
rename to test/integration/targets/copy/files/subdir/bar.txt
diff --git a/test/integration/roles/test_copy/files/subdir/subdir2/baz.txt b/test/integration/targets/copy/files/subdir/subdir2/baz.txt
similarity index 100%
rename from test/integration/roles/test_copy/files/subdir/subdir2/baz.txt
rename to test/integration/targets/copy/files/subdir/subdir2/baz.txt
diff --git a/test/integration/roles/test_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt b/test/integration/targets/copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
similarity index 100%
rename from test/integration/roles/test_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
rename to test/integration/targets/copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
diff --git a/test/integration/roles/test_copy/meta/main.yml b/test/integration/targets/copy/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_copy/meta/main.yml
rename to test/integration/targets/copy/meta/main.yml
diff --git a/test/integration/roles/test_copy/tasks/main.yml b/test/integration/targets/copy/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_copy/tasks/main.yml
rename to test/integration/targets/copy/tasks/main.yml
diff --git a/test/integration/roles/test_docker/files/devdockerCA.crt b/test/integration/targets/docker/files/devdockerCA.crt
similarity index 100%
rename from test/integration/roles/test_docker/files/devdockerCA.crt
rename to test/integration/targets/docker/files/devdockerCA.crt
diff --git a/test/integration/roles/test_docker/files/devdockerCA.key b/test/integration/targets/docker/files/devdockerCA.key
similarity index 100%
rename from test/integration/roles/test_docker/files/devdockerCA.key
rename to test/integration/targets/docker/files/devdockerCA.key
diff --git a/test/integration/roles/test_docker/files/devdockerCA.srl b/test/integration/targets/docker/files/devdockerCA.srl
similarity index 100%
rename from test/integration/roles/test_docker/files/devdockerCA.srl
rename to test/integration/targets/docker/files/devdockerCA.srl
diff --git a/test/integration/roles/test_docker/files/docker-registry.htpasswd b/test/integration/targets/docker/files/docker-registry.htpasswd
similarity index 100%
rename from test/integration/roles/test_docker/files/docker-registry.htpasswd
rename to test/integration/targets/docker/files/docker-registry.htpasswd
diff --git a/test/integration/roles/test_docker/files/dockertest.ansible.com.crt b/test/integration/targets/docker/files/dockertest.ansible.com.crt
similarity index 100%
rename from test/integration/roles/test_docker/files/dockertest.ansible.com.crt
rename to test/integration/targets/docker/files/dockertest.ansible.com.crt
diff --git a/test/integration/roles/test_docker/files/dockertest.ansible.com.csr b/test/integration/targets/docker/files/dockertest.ansible.com.csr
similarity index 100%
rename from test/integration/roles/test_docker/files/dockertest.ansible.com.csr
rename to test/integration/targets/docker/files/dockertest.ansible.com.csr
diff --git a/test/integration/roles/test_docker/files/dockertest.ansible.com.key b/test/integration/targets/docker/files/dockertest.ansible.com.key
similarity index 100%
rename from test/integration/roles/test_docker/files/dockertest.ansible.com.key
rename to test/integration/targets/docker/files/dockertest.ansible.com.key
diff --git a/test/integration/roles/test_docker/files/nginx-docker-registry.conf b/test/integration/targets/docker/files/nginx-docker-registry.conf
similarity index 100%
rename from test/integration/roles/test_docker/files/nginx-docker-registry.conf
rename to test/integration/targets/docker/files/nginx-docker-registry.conf
diff --git a/test/integration/roles/test_docker/meta/main.yml b/test/integration/targets/docker/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_docker/meta/main.yml
rename to test/integration/targets/docker/meta/main.yml
diff --git a/test/integration/roles/test_docker/tasks/docker-setup-debian.yml b/test/integration/targets/docker/tasks/docker-setup-debian.yml
similarity index 100%
rename from test/integration/roles/test_docker/tasks/docker-setup-debian.yml
rename to test/integration/targets/docker/tasks/docker-setup-debian.yml
diff --git a/test/integration/roles/test_docker/tasks/docker-setup-rht.yml b/test/integration/targets/docker/tasks/docker-setup-rht.yml
similarity index 100%
rename from test/integration/roles/test_docker/tasks/docker-setup-rht.yml
rename to test/integration/targets/docker/tasks/docker-setup-rht.yml
diff --git a/test/integration/roles/test_docker/tasks/docker-tests.yml b/test/integration/targets/docker/tasks/docker-tests.yml
similarity index 100%
rename from test/integration/roles/test_docker/tasks/docker-tests.yml
rename to test/integration/targets/docker/tasks/docker-tests.yml
diff --git a/test/integration/roles/test_docker/tasks/main.yml b/test/integration/targets/docker/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_docker/tasks/main.yml
rename to test/integration/targets/docker/tasks/main.yml
diff --git a/test/integration/roles/test_docker/tasks/registry-tests.yml b/test/integration/targets/docker/tasks/registry-tests.yml
similarity index 100%
rename from test/integration/roles/test_docker/tasks/registry-tests.yml
rename to test/integration/targets/docker/tasks/registry-tests.yml
diff --git a/test/integration/roles/test_embedded_module/library/test_integration_module b/test/integration/targets/embedded_module/library/test_integration_module
similarity index 100%
rename from test/integration/roles/test_embedded_module/library/test_integration_module
rename to test/integration/targets/embedded_module/library/test_integration_module
diff --git a/test/integration/roles/test_embedded_module/tasks/main.yml b/test/integration/targets/embedded_module/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_embedded_module/tasks/main.yml
rename to test/integration/targets/embedded_module/tasks/main.yml
diff --git a/test/integration/roles/test_facts_d/meta/main.yml b/test/integration/targets/facts_d/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_facts_d/meta/main.yml
rename to test/integration/targets/facts_d/meta/main.yml
diff --git a/test/integration/roles/test_facts_d/tasks/main.yml b/test/integration/targets/facts_d/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_facts_d/tasks/main.yml
rename to test/integration/targets/facts_d/tasks/main.yml
diff --git a/test/integration/roles/test_failed_when/tasks/main.yml b/test/integration/targets/failed_when/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_failed_when/tasks/main.yml
rename to test/integration/targets/failed_when/tasks/main.yml
diff --git a/test/integration/roles/test_fetch/meta/main.yml b/test/integration/targets/fetch/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_fetch/meta/main.yml
rename to test/integration/targets/fetch/meta/main.yml
diff --git a/test/integration/roles/test_fetch/tasks/main.yml b/test/integration/targets/fetch/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_fetch/tasks/main.yml
rename to test/integration/targets/fetch/tasks/main.yml
diff --git a/test/integration/roles/test_file/files/foo.txt b/test/integration/targets/file/files/foo.txt
similarity index 100%
rename from test/integration/roles/test_file/files/foo.txt
rename to test/integration/targets/file/files/foo.txt
diff --git a/test/integration/roles/test_file/files/foobar/directory/fileC b/test/integration/targets/file/files/foobar/directory/fileC
similarity index 100%
rename from test/integration/roles/test_file/files/foobar/directory/fileC
rename to test/integration/targets/file/files/foobar/directory/fileC
diff --git a/test/integration/roles/test_file/files/foobar/directory/fileD b/test/integration/targets/file/files/foobar/directory/fileD
similarity index 100%
rename from test/integration/roles/test_file/files/foobar/directory/fileD
rename to test/integration/targets/file/files/foobar/directory/fileD
diff --git a/test/integration/roles/test_file/files/foobar/fileA b/test/integration/targets/file/files/foobar/fileA
similarity index 100%
rename from test/integration/roles/test_file/files/foobar/fileA
rename to test/integration/targets/file/files/foobar/fileA
diff --git a/test/integration/roles/test_file/files/foobar/fileB b/test/integration/targets/file/files/foobar/fileB
similarity index 100%
rename from test/integration/roles/test_file/files/foobar/fileB
rename to test/integration/targets/file/files/foobar/fileB
diff --git a/test/integration/roles/test_file/meta/main.yml b/test/integration/targets/file/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_file/meta/main.yml
rename to test/integration/targets/file/meta/main.yml
diff --git a/test/integration/roles/test_file/tasks/main.yml b/test/integration/targets/file/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_file/tasks/main.yml
rename to test/integration/targets/file/tasks/main.yml
diff --git a/test/integration/roles/test_file/tasks/selinux_tests.yml b/test/integration/targets/file/tasks/selinux_tests.yml
similarity index 100%
rename from test/integration/roles/test_file/tasks/selinux_tests.yml
rename to test/integration/targets/file/tasks/selinux_tests.yml
diff --git a/test/integration/roles/test_filters/files/9851.txt b/test/integration/targets/filters/files/9851.txt
similarity index 100%
rename from test/integration/roles/test_filters/files/9851.txt
rename to test/integration/targets/filters/files/9851.txt
diff --git a/test/integration/roles/test_filters/files/foo.txt b/test/integration/targets/filters/files/foo.txt
similarity index 100%
rename from test/integration/roles/test_filters/files/foo.txt
rename to test/integration/targets/filters/files/foo.txt
diff --git a/test/integration/roles/test_filters/meta/main.yml b/test/integration/targets/filters/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_filters/meta/main.yml
rename to test/integration/targets/filters/meta/main.yml
diff --git a/test/integration/roles/test_filters/tasks/main.yml b/test/integration/targets/filters/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_filters/tasks/main.yml
rename to test/integration/targets/filters/tasks/main.yml
diff --git a/test/integration/roles/test_filters/templates/foo.j2 b/test/integration/targets/filters/templates/foo.j2
similarity index 100%
rename from test/integration/roles/test_filters/templates/foo.j2
rename to test/integration/targets/filters/templates/foo.j2
diff --git a/test/integration/roles/test_filters/templates/py26json.j2 b/test/integration/targets/filters/templates/py26json.j2
similarity index 100%
rename from test/integration/roles/test_filters/templates/py26json.j2
rename to test/integration/targets/filters/templates/py26json.j2
diff --git a/test/integration/roles/test_filters/vars/main.yml b/test/integration/targets/filters/vars/main.yml
similarity index 100%
rename from test/integration/roles/test_filters/vars/main.yml
rename to test/integration/targets/filters/vars/main.yml
diff --git a/test/integration/roles/test_gem/meta/main.yml b/test/integration/targets/gem/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_gem/meta/main.yml
rename to test/integration/targets/gem/meta/main.yml
diff --git a/test/integration/roles/test_gem/tasks/main.yml b/test/integration/targets/gem/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_gem/tasks/main.yml
rename to test/integration/targets/gem/tasks/main.yml
diff --git a/test/integration/roles/test_get_url/meta/main.yml b/test/integration/targets/get_url/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_get_url/meta/main.yml
rename to test/integration/targets/get_url/meta/main.yml
diff --git a/test/integration/roles/test_get_url/tasks/main.yml b/test/integration/targets/get_url/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_get_url/tasks/main.yml
rename to test/integration/targets/get_url/tasks/main.yml
diff --git a/test/integration/roles/test_git/meta/main.yml b/test/integration/targets/git/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_git/meta/main.yml
rename to test/integration/targets/git/meta/main.yml
diff --git a/test/integration/roles/test_git/tasks/main.yml b/test/integration/targets/git/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_git/tasks/main.yml
rename to test/integration/targets/git/tasks/main.yml
diff --git a/test/integration/roles/test_hg/meta/main.yml b/test/integration/targets/hg/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_hg/meta/main.yml
rename to test/integration/targets/hg/meta/main.yml
diff --git a/test/integration/roles/test_hg/tasks/main.yml b/test/integration/targets/hg/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_hg/tasks/main.yml
rename to test/integration/targets/hg/tasks/main.yml
diff --git a/test/integration/roles/test_ignore_errors/meta/main.yml b/test/integration/targets/ignore_errors/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_ignore_errors/meta/main.yml
rename to test/integration/targets/ignore_errors/meta/main.yml
diff --git a/test/integration/roles/test_ignore_errors/tasks/main.yml b/test/integration/targets/ignore_errors/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_ignore_errors/tasks/main.yml
rename to test/integration/targets/ignore_errors/tasks/main.yml
diff --git a/test/integration/roles/test_include_vars/defaults/main.yml b/test/integration/targets/include_vars/defaults/main.yml
similarity index 100%
rename from test/integration/roles/test_include_vars/defaults/main.yml
rename to test/integration/targets/include_vars/defaults/main.yml
diff --git a/test/integration/roles/test_include_vars/tasks/main.yml b/test/integration/targets/include_vars/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_include_vars/tasks/main.yml
rename to test/integration/targets/include_vars/tasks/main.yml
diff --git a/test/integration/roles/test_include_vars/vars/all/all.yml b/test/integration/targets/include_vars/vars/all/all.yml
similarity index 100%
rename from test/integration/roles/test_include_vars/vars/all/all.yml
rename to test/integration/targets/include_vars/vars/all/all.yml
diff --git a/test/integration/roles/test_include_vars/vars/environments/development/all.yml b/test/integration/targets/include_vars/vars/environments/development/all.yml
similarity index 100%
rename from test/integration/roles/test_include_vars/vars/environments/development/all.yml
rename to test/integration/targets/include_vars/vars/environments/development/all.yml
diff --git a/test/integration/roles/test_include_vars/vars/environments/development/services/webapp.yml b/test/integration/targets/include_vars/vars/environments/development/services/webapp.yml
similarity index 100%
rename from test/integration/roles/test_include_vars/vars/environments/development/services/webapp.yml
rename to test/integration/targets/include_vars/vars/environments/development/services/webapp.yml
diff --git a/test/integration/roles/test_include_vars/vars/services/webapp.yml b/test/integration/targets/include_vars/vars/services/webapp.yml
similarity index 100%
rename from test/integration/roles/test_include_vars/vars/services/webapp.yml
rename to test/integration/targets/include_vars/vars/services/webapp.yml
diff --git a/test/integration/roles/test_iterators/meta/main.yml b/test/integration/targets/iterators/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_iterators/meta/main.yml
rename to test/integration/targets/iterators/meta/main.yml
diff --git a/test/integration/roles/test_iterators/tasks/main.yml b/test/integration/targets/iterators/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_iterators/tasks/main.yml
rename to test/integration/targets/iterators/tasks/main.yml
diff --git a/test/integration/roles/test_iterators/vars/main.yml b/test/integration/targets/iterators/vars/main.yml
similarity index 100%
rename from test/integration/roles/test_iterators/vars/main.yml
rename to test/integration/targets/iterators/vars/main.yml
diff --git a/test/integration/roles/test_lineinfile/files/test.txt b/test/integration/targets/lineinfile/files/test.txt
similarity index 100%
rename from test/integration/roles/test_lineinfile/files/test.txt
rename to test/integration/targets/lineinfile/files/test.txt
diff --git a/test/integration/roles/test_lineinfile/files/testempty.txt b/test/integration/targets/lineinfile/files/testempty.txt
similarity index 100%
rename from test/integration/roles/test_lineinfile/files/testempty.txt
rename to test/integration/targets/lineinfile/files/testempty.txt
diff --git a/test/integration/roles/test_lineinfile/files/testnoeof.txt b/test/integration/targets/lineinfile/files/testnoeof.txt
similarity index 100%
rename from test/integration/roles/test_lineinfile/files/testnoeof.txt
rename to test/integration/targets/lineinfile/files/testnoeof.txt
diff --git a/test/integration/roles/test_lineinfile/meta/main.yml b/test/integration/targets/lineinfile/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_lineinfile/meta/main.yml
rename to test/integration/targets/lineinfile/meta/main.yml
diff --git a/test/integration/roles/test_lineinfile/tasks/main.yml b/test/integration/targets/lineinfile/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_lineinfile/tasks/main.yml
rename to test/integration/targets/lineinfile/tasks/main.yml
diff --git a/test/integration/roles/test_lookups/meta/main.yml b/test/integration/targets/lookups/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_lookups/meta/main.yml
rename to test/integration/targets/lookups/meta/main.yml
diff --git a/test/integration/roles/test_lookups/tasks/main.yml b/test/integration/targets/lookups/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_lookups/tasks/main.yml
rename to test/integration/targets/lookups/tasks/main.yml
diff --git a/test/integration/roles/test_lookups/vars/main.yml b/test/integration/targets/lookups/vars/main.yml
similarity index 100%
rename from test/integration/roles/test_lookups/vars/main.yml
rename to test/integration/targets/lookups/vars/main.yml
diff --git a/test/integration/roles/test_loops/tasks/main.yml b/test/integration/targets/loops/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_loops/tasks/main.yml
rename to test/integration/targets/loops/tasks/main.yml
diff --git a/test/integration/roles/test_mount/tasks/main.yml b/test/integration/targets/mount/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_mount/tasks/main.yml
rename to test/integration/targets/mount/tasks/main.yml
diff --git a/test/integration/roles/test_mysql_db/defaults/main.yml b/test/integration/targets/mysql_db/defaults/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_db/defaults/main.yml
rename to test/integration/targets/mysql_db/defaults/main.yml
diff --git a/test/integration/roles/test_mysql_db/meta/main.yml b/test/integration/targets/mysql_db/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_db/meta/main.yml
rename to test/integration/targets/mysql_db/meta/main.yml
diff --git a/test/integration/roles/test_mysql_db/tasks/main.yml b/test/integration/targets/mysql_db/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_db/tasks/main.yml
rename to test/integration/targets/mysql_db/tasks/main.yml
diff --git a/test/integration/roles/test_mysql_db/tasks/state_dump_import.yml b/test/integration/targets/mysql_db/tasks/state_dump_import.yml
similarity index 100%
rename from test/integration/roles/test_mysql_db/tasks/state_dump_import.yml
rename to test/integration/targets/mysql_db/tasks/state_dump_import.yml
diff --git a/test/integration/roles/test_mysql_user/defaults/main.yml b/test/integration/targets/mysql_user/defaults/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/defaults/main.yml
rename to test/integration/targets/mysql_user/defaults/main.yml
diff --git a/test/integration/roles/test_mysql_user/meta/main.yml b/test/integration/targets/mysql_user/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/meta/main.yml
rename to test/integration/targets/mysql_user/meta/main.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/assert_no_user.yml b/test/integration/targets/mysql_user/tasks/assert_no_user.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/tasks/assert_no_user.yml
rename to test/integration/targets/mysql_user/tasks/assert_no_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/assert_user.yml b/test/integration/targets/mysql_user/tasks/assert_user.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/tasks/assert_user.yml
rename to test/integration/targets/mysql_user/tasks/assert_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/create_user.yml b/test/integration/targets/mysql_user/tasks/create_user.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/tasks/create_user.yml
rename to test/integration/targets/mysql_user/tasks/create_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/main.yml b/test/integration/targets/mysql_user/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/tasks/main.yml
rename to test/integration/targets/mysql_user/tasks/main.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/remove_user.yml b/test/integration/targets/mysql_user/tasks/remove_user.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/tasks/remove_user.yml
rename to test/integration/targets/mysql_user/tasks/remove_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/test_privs.yml b/test/integration/targets/mysql_user/tasks/test_privs.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/tasks/test_privs.yml
rename to test/integration/targets/mysql_user/tasks/test_privs.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/user_password_update_test.yml b/test/integration/targets/mysql_user/tasks/user_password_update_test.yml
similarity index 100%
rename from test/integration/roles/test_mysql_user/tasks/user_password_update_test.yml
rename to test/integration/targets/mysql_user/tasks/user_password_update_test.yml
diff --git a/test/integration/roles/test_mysql_variables/defaults/main.yml b/test/integration/targets/mysql_variables/defaults/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_variables/defaults/main.yml
rename to test/integration/targets/mysql_variables/defaults/main.yml
diff --git a/test/integration/roles/test_mysql_variables/meta/main.yml b/test/integration/targets/mysql_variables/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_variables/meta/main.yml
rename to test/integration/targets/mysql_variables/meta/main.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/assert_fail_msg.yml b/test/integration/targets/mysql_variables/tasks/assert_fail_msg.yml
similarity index 100%
rename from test/integration/roles/test_mysql_variables/tasks/assert_fail_msg.yml
rename to test/integration/targets/mysql_variables/tasks/assert_fail_msg.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/assert_var.yml b/test/integration/targets/mysql_variables/tasks/assert_var.yml
similarity index 100%
rename from test/integration/roles/test_mysql_variables/tasks/assert_var.yml
rename to test/integration/targets/mysql_variables/tasks/assert_var.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/assert_var_output.yml b/test/integration/targets/mysql_variables/tasks/assert_var_output.yml
similarity index 100%
rename from test/integration/roles/test_mysql_variables/tasks/assert_var_output.yml
rename to test/integration/targets/mysql_variables/tasks/assert_var_output.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/main.yml b/test/integration/targets/mysql_variables/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_mysql_variables/tasks/main.yml
rename to test/integration/targets/mysql_variables/tasks/main.yml
diff --git a/test/integration/roles/test_ping/tasks/main.yml b/test/integration/targets/ping/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_ping/tasks/main.yml
rename to test/integration/targets/ping/tasks/main.yml
diff --git a/test/integration/roles/test_pip/meta/main.yml b/test/integration/targets/pip/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_pip/meta/main.yml
rename to test/integration/targets/pip/meta/main.yml
diff --git a/test/integration/roles/test_pip/tasks/main.yml b/test/integration/targets/pip/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_pip/tasks/main.yml
rename to test/integration/targets/pip/tasks/main.yml
diff --git a/test/integration/roles/test_pip/tasks/pip.yml b/test/integration/targets/pip/tasks/pip.yml
similarity index 100%
rename from test/integration/roles/test_pip/tasks/pip.yml
rename to test/integration/targets/pip/tasks/pip.yml
diff --git a/test/integration/roles/test_postgresql/defaults/main.yml b/test/integration/targets/postgresql/defaults/main.yml
similarity index 100%
rename from test/integration/roles/test_postgresql/defaults/main.yml
rename to test/integration/targets/postgresql/defaults/main.yml
diff --git a/test/integration/roles/test_postgresql/meta/main.yml b/test/integration/targets/postgresql/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_postgresql/meta/main.yml
rename to test/integration/targets/postgresql/meta/main.yml
diff --git a/test/integration/roles/test_postgresql/tasks/main.yml b/test/integration/targets/postgresql/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_postgresql/tasks/main.yml
rename to test/integration/targets/postgresql/tasks/main.yml
diff --git a/test/integration/roles/prepare_http_tests/defaults/main.yml b/test/integration/targets/prepare_http_tests/defaults/main.yml
similarity index 100%
rename from test/integration/roles/prepare_http_tests/defaults/main.yml
rename to test/integration/targets/prepare_http_tests/defaults/main.yml
diff --git a/test/integration/roles/prepare_http_tests/tasks/main.yml b/test/integration/targets/prepare_http_tests/tasks/main.yml
similarity index 100%
rename from test/integration/roles/prepare_http_tests/tasks/main.yml
rename to test/integration/targets/prepare_http_tests/tasks/main.yml
diff --git a/test/integration/roles/prepare_http_tests/vars/httptester.yml b/test/integration/targets/prepare_http_tests/vars/httptester.yml
similarity index 100%
rename from test/integration/roles/prepare_http_tests/vars/httptester.yml
rename to test/integration/targets/prepare_http_tests/vars/httptester.yml
diff --git a/test/integration/roles/test_service/templates/main.yml b/test/integration/targets/prepare_tests/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_service/templates/main.yml
rename to test/integration/targets/prepare_tests/tasks/main.yml
diff --git a/test/integration/roles/test_script/files/create_afile.sh b/test/integration/targets/script/files/create_afile.sh
similarity index 100%
rename from test/integration/roles/test_script/files/create_afile.sh
rename to test/integration/targets/script/files/create_afile.sh
diff --git a/test/integration/roles/test_script/files/remove_afile.sh b/test/integration/targets/script/files/remove_afile.sh
similarity index 100%
rename from test/integration/roles/test_script/files/remove_afile.sh
rename to test/integration/targets/script/files/remove_afile.sh
diff --git a/test/integration/roles/test_script/files/test.sh b/test/integration/targets/script/files/test.sh
similarity index 100%
rename from test/integration/roles/test_script/files/test.sh
rename to test/integration/targets/script/files/test.sh
diff --git a/test/integration/roles/test_script/meta/main.yml b/test/integration/targets/script/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_script/meta/main.yml
rename to test/integration/targets/script/meta/main.yml
diff --git a/test/integration/roles/test_script/tasks/main.yml b/test/integration/targets/script/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_script/tasks/main.yml
rename to test/integration/targets/script/tasks/main.yml
diff --git a/test/integration/roles/test_service/files/ansible-broken.upstart b/test/integration/targets/service/files/ansible-broken.upstart
similarity index 100%
rename from test/integration/roles/test_service/files/ansible-broken.upstart
rename to test/integration/targets/service/files/ansible-broken.upstart
diff --git a/test/integration/roles/test_service/files/ansible.systemd b/test/integration/targets/service/files/ansible.systemd
similarity index 100%
rename from test/integration/roles/test_service/files/ansible.systemd
rename to test/integration/targets/service/files/ansible.systemd
diff --git a/test/integration/roles/test_service/files/ansible.sysv b/test/integration/targets/service/files/ansible.sysv
similarity index 100%
rename from test/integration/roles/test_service/files/ansible.sysv
rename to test/integration/targets/service/files/ansible.sysv
diff --git a/test/integration/roles/test_service/files/ansible.upstart b/test/integration/targets/service/files/ansible.upstart
similarity index 100%
rename from test/integration/roles/test_service/files/ansible.upstart
rename to test/integration/targets/service/files/ansible.upstart
diff --git a/test/integration/roles/test_service/files/ansible_test_service b/test/integration/targets/service/files/ansible_test_service
similarity index 100%
rename from test/integration/roles/test_service/files/ansible_test_service
rename to test/integration/targets/service/files/ansible_test_service
diff --git a/test/integration/roles/test_service/meta/main.yml b/test/integration/targets/service/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_service/meta/main.yml
rename to test/integration/targets/service/meta/main.yml
diff --git a/test/integration/roles/test_service/tasks/main.yml b/test/integration/targets/service/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_service/tasks/main.yml
rename to test/integration/targets/service/tasks/main.yml
diff --git a/test/integration/roles/test_service/tasks/systemd_cleanup.yml b/test/integration/targets/service/tasks/systemd_cleanup.yml
similarity index 100%
rename from test/integration/roles/test_service/tasks/systemd_cleanup.yml
rename to test/integration/targets/service/tasks/systemd_cleanup.yml
diff --git a/test/integration/roles/test_service/tasks/systemd_setup.yml b/test/integration/targets/service/tasks/systemd_setup.yml
similarity index 100%
rename from test/integration/roles/test_service/tasks/systemd_setup.yml
rename to test/integration/targets/service/tasks/systemd_setup.yml
diff --git a/test/integration/roles/test_service/tasks/sysv_cleanup.yml b/test/integration/targets/service/tasks/sysv_cleanup.yml
similarity index 100%
rename from test/integration/roles/test_service/tasks/sysv_cleanup.yml
rename to test/integration/targets/service/tasks/sysv_cleanup.yml
diff --git a/test/integration/roles/test_service/tasks/sysv_setup.yml b/test/integration/targets/service/tasks/sysv_setup.yml
similarity index 100%
rename from test/integration/roles/test_service/tasks/sysv_setup.yml
rename to test/integration/targets/service/tasks/sysv_setup.yml
diff --git a/test/integration/roles/test_service/tasks/upstart_cleanup.yml b/test/integration/targets/service/tasks/upstart_cleanup.yml
similarity index 100%
rename from test/integration/roles/test_service/tasks/upstart_cleanup.yml
rename to test/integration/targets/service/tasks/upstart_cleanup.yml
diff --git a/test/integration/roles/test_service/tasks/upstart_setup.yml b/test/integration/targets/service/tasks/upstart_setup.yml
similarity index 100%
rename from test/integration/roles/test_service/tasks/upstart_setup.yml
rename to test/integration/targets/service/tasks/upstart_setup.yml
diff --git a/test/integration/roles/test_special_vars/vars/main.yml b/test/integration/targets/service/templates/main.yml
similarity index 100%
rename from test/integration/roles/test_special_vars/vars/main.yml
rename to test/integration/targets/service/templates/main.yml
diff --git a/test/integration/roles/setup_mysql_db/defaults/main.yml b/test/integration/targets/setup_mysql_db/defaults/main.yml
similarity index 100%
rename from test/integration/roles/setup_mysql_db/defaults/main.yml
rename to test/integration/targets/setup_mysql_db/defaults/main.yml
diff --git a/test/integration/roles/setup_mysql_db/tasks/main.yml b/test/integration/targets/setup_mysql_db/tasks/main.yml
similarity index 100%
rename from test/integration/roles/setup_mysql_db/tasks/main.yml
rename to test/integration/targets/setup_mysql_db/tasks/main.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/Debian.yml b/test/integration/targets/setup_mysql_db/vars/Debian.yml
similarity index 100%
rename from test/integration/roles/setup_mysql_db/vars/Debian.yml
rename to test/integration/targets/setup_mysql_db/vars/Debian.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/Fedora.yml b/test/integration/targets/setup_mysql_db/vars/Fedora.yml
similarity index 100%
rename from test/integration/roles/setup_mysql_db/vars/Fedora.yml
rename to test/integration/targets/setup_mysql_db/vars/Fedora.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/RedHat-7.yml b/test/integration/targets/setup_mysql_db/vars/RedHat-7.yml
similarity index 100%
rename from test/integration/roles/setup_mysql_db/vars/RedHat-7.yml
rename to test/integration/targets/setup_mysql_db/vars/RedHat-7.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/RedHat.yml b/test/integration/targets/setup_mysql_db/vars/RedHat.yml
similarity index 100%
rename from test/integration/roles/setup_mysql_db/vars/RedHat.yml
rename to test/integration/targets/setup_mysql_db/vars/RedHat.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/Suse.yml b/test/integration/targets/setup_mysql_db/vars/Suse.yml
similarity index 100%
rename from test/integration/roles/setup_mysql_db/vars/Suse.yml
rename to test/integration/targets/setup_mysql_db/vars/Suse.yml
diff --git a/test/integration/roles/setup_postgresql_db/defaults/main.yml b/test/integration/targets/setup_postgresql_db/defaults/main.yml
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/defaults/main.yml
rename to test/integration/targets/setup_postgresql_db/defaults/main.yml
diff --git a/test/integration/roles/setup_postgresql_db/files/pg_hba.conf b/test/integration/targets/setup_postgresql_db/files/pg_hba.conf
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/files/pg_hba.conf
rename to test/integration/targets/setup_postgresql_db/files/pg_hba.conf
diff --git a/test/integration/roles/setup_postgresql_db/tasks/main.yml b/test/integration/targets/setup_postgresql_db/tasks/main.yml
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/tasks/main.yml
rename to test/integration/targets/setup_postgresql_db/tasks/main.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Debian-8.yml b/test/integration/targets/setup_postgresql_db/vars/Debian-8.yml
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/vars/Debian-8.yml
rename to test/integration/targets/setup_postgresql_db/vars/Debian-8.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-12.yml b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/vars/Ubuntu-12.yml
rename to test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-14.yml b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-14.yml
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/vars/Ubuntu-14.yml
rename to test/integration/targets/setup_postgresql_db/vars/Ubuntu-14.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-16.yml b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-16.yml
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/vars/Ubuntu-16.yml
rename to test/integration/targets/setup_postgresql_db/vars/Ubuntu-16.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/default.yml b/test/integration/targets/setup_postgresql_db/vars/default.yml
similarity index 100%
rename from test/integration/roles/setup_postgresql_db/vars/default.yml
rename to test/integration/targets/setup_postgresql_db/vars/default.yml
diff --git a/test/integration/roles/test_special_vars/meta/main.yml b/test/integration/targets/special_vars/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_special_vars/meta/main.yml
rename to test/integration/targets/special_vars/meta/main.yml
diff --git a/test/integration/roles/test_special_vars/tasks/main.yml b/test/integration/targets/special_vars/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_special_vars/tasks/main.yml
rename to test/integration/targets/special_vars/tasks/main.yml
diff --git a/test/integration/roles/test_special_vars/templates/foo.j2 b/test/integration/targets/special_vars/templates/foo.j2
similarity index 100%
rename from test/integration/roles/test_special_vars/templates/foo.j2
rename to test/integration/targets/special_vars/templates/foo.j2
diff --git a/test/integration/targets/special_vars/vars/main.yml b/test/integration/targets/special_vars/vars/main.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/integration/roles/test_stat/files/foo.txt b/test/integration/targets/stat/files/foo.txt
similarity index 100%
rename from test/integration/roles/test_stat/files/foo.txt
rename to test/integration/targets/stat/files/foo.txt
diff --git a/test/integration/roles/test_stat/meta/main.yml b/test/integration/targets/stat/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_stat/meta/main.yml
rename to test/integration/targets/stat/meta/main.yml
diff --git a/test/integration/roles/test_stat/tasks/main.yml b/test/integration/targets/stat/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_stat/tasks/main.yml
rename to test/integration/targets/stat/tasks/main.yml
diff --git a/test/integration/roles/test_subversion/meta/main.yml b/test/integration/targets/subversion/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_subversion/meta/main.yml
rename to test/integration/targets/subversion/meta/main.yml
diff --git a/test/integration/roles/test_subversion/tasks/main.yml b/test/integration/targets/subversion/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_subversion/tasks/main.yml
rename to test/integration/targets/subversion/tasks/main.yml
diff --git a/test/integration/roles/test_synchronize/files/bar.txt b/test/integration/targets/synchronize/files/bar.txt
similarity index 100%
rename from test/integration/roles/test_synchronize/files/bar.txt
rename to test/integration/targets/synchronize/files/bar.txt
diff --git a/test/integration/roles/test_synchronize/files/foo.txt b/test/integration/targets/synchronize/files/foo.txt
similarity index 100%
rename from test/integration/roles/test_synchronize/files/foo.txt
rename to test/integration/targets/synchronize/files/foo.txt
diff --git a/test/integration/roles/test_synchronize/meta/main.yml b/test/integration/targets/synchronize/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_synchronize/meta/main.yml
rename to test/integration/targets/synchronize/meta/main.yml
diff --git a/test/integration/roles/test_synchronize/tasks/main.yml b/test/integration/targets/synchronize/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_synchronize/tasks/main.yml
rename to test/integration/targets/synchronize/tasks/main.yml
diff --git a/test/integration/roles/test_task_ordering/tasks/main.yml b/test/integration/targets/task_ordering/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_task_ordering/tasks/main.yml
rename to test/integration/targets/task_ordering/tasks/main.yml
diff --git a/test/integration/roles/test_task_ordering/tasks/taskorder-include.yml b/test/integration/targets/task_ordering/tasks/taskorder-include.yml
similarity index 100%
rename from test/integration/roles/test_task_ordering/tasks/taskorder-include.yml
rename to test/integration/targets/task_ordering/tasks/taskorder-include.yml
diff --git a/test/integration/roles/test_template/files/foo-py26.txt b/test/integration/targets/template/files/foo-py26.txt
similarity index 100%
rename from test/integration/roles/test_template/files/foo-py26.txt
rename to test/integration/targets/template/files/foo-py26.txt
diff --git a/test/integration/roles/test_template/files/foo.txt b/test/integration/targets/template/files/foo.txt
similarity index 100%
rename from test/integration/roles/test_template/files/foo.txt
rename to test/integration/targets/template/files/foo.txt
diff --git a/test/integration/roles/test_template/meta/main.yml b/test/integration/targets/template/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_template/meta/main.yml
rename to test/integration/targets/template/meta/main.yml
diff --git a/test/integration/roles/test_template/tasks/main.yml b/test/integration/targets/template/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_template/tasks/main.yml
rename to test/integration/targets/template/tasks/main.yml
diff --git a/test/integration/roles/test_template/templates/foo.j2 b/test/integration/targets/template/templates/foo.j2
similarity index 100%
rename from test/integration/roles/test_template/templates/foo.j2
rename to test/integration/targets/template/templates/foo.j2
diff --git a/test/integration/roles/test_template/templates/short.j2 b/test/integration/targets/template/templates/short.j2
similarity index 100%
rename from test/integration/roles/test_template/templates/short.j2
rename to test/integration/targets/template/templates/short.j2
diff --git a/test/integration/roles/test_template/vars/main.yml b/test/integration/targets/template/vars/main.yml
similarity index 100%
rename from test/integration/roles/test_template/vars/main.yml
rename to test/integration/targets/template/vars/main.yml
diff --git a/test/integration/roles/test_unarchive/files/foo.txt b/test/integration/targets/unarchive/files/foo.txt
similarity index 100%
rename from test/integration/roles/test_unarchive/files/foo.txt
rename to test/integration/targets/unarchive/files/foo.txt
diff --git a/test/integration/roles/test_unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz b/test/integration/targets/unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz
similarity index 100%
rename from test/integration/roles/test_unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz
rename to test/integration/targets/unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz
diff --git a/test/integration/roles/test_unarchive/meta/main.yml b/test/integration/targets/unarchive/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_unarchive/meta/main.yml
rename to test/integration/targets/unarchive/meta/main.yml
diff --git a/test/integration/roles/test_unarchive/tasks/main.yml b/test/integration/targets/unarchive/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_unarchive/tasks/main.yml
rename to test/integration/targets/unarchive/tasks/main.yml
diff --git a/test/integration/roles/test_until/tasks/main.yml b/test/integration/targets/until/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_until/tasks/main.yml
rename to test/integration/targets/until/tasks/main.yml
diff --git a/test/integration/roles/test_uri/files/README b/test/integration/targets/uri/files/README
similarity index 100%
rename from test/integration/roles/test_uri/files/README
rename to test/integration/targets/uri/files/README
diff --git a/test/integration/roles/test_uri/files/fail0.json b/test/integration/targets/uri/files/fail0.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail0.json
rename to test/integration/targets/uri/files/fail0.json
diff --git a/test/integration/roles/test_uri/files/fail1.json b/test/integration/targets/uri/files/fail1.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail1.json
rename to test/integration/targets/uri/files/fail1.json
diff --git a/test/integration/roles/test_uri/files/fail10.json b/test/integration/targets/uri/files/fail10.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail10.json
rename to test/integration/targets/uri/files/fail10.json
diff --git a/test/integration/roles/test_uri/files/fail11.json b/test/integration/targets/uri/files/fail11.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail11.json
rename to test/integration/targets/uri/files/fail11.json
diff --git a/test/integration/roles/test_uri/files/fail12.json b/test/integration/targets/uri/files/fail12.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail12.json
rename to test/integration/targets/uri/files/fail12.json
diff --git a/test/integration/roles/test_uri/files/fail13.json b/test/integration/targets/uri/files/fail13.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail13.json
rename to test/integration/targets/uri/files/fail13.json
diff --git a/test/integration/roles/test_uri/files/fail14.json b/test/integration/targets/uri/files/fail14.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail14.json
rename to test/integration/targets/uri/files/fail14.json
diff --git a/test/integration/roles/test_uri/files/fail15.json b/test/integration/targets/uri/files/fail15.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail15.json
rename to test/integration/targets/uri/files/fail15.json
diff --git a/test/integration/roles/test_uri/files/fail16.json b/test/integration/targets/uri/files/fail16.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail16.json
rename to test/integration/targets/uri/files/fail16.json
diff --git a/test/integration/roles/test_uri/files/fail17.json b/test/integration/targets/uri/files/fail17.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail17.json
rename to test/integration/targets/uri/files/fail17.json
diff --git a/test/integration/roles/test_uri/files/fail18.json b/test/integration/targets/uri/files/fail18.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail18.json
rename to test/integration/targets/uri/files/fail18.json
diff --git a/test/integration/roles/test_uri/files/fail19.json b/test/integration/targets/uri/files/fail19.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail19.json
rename to test/integration/targets/uri/files/fail19.json
diff --git a/test/integration/roles/test_uri/files/fail2.json b/test/integration/targets/uri/files/fail2.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail2.json
rename to test/integration/targets/uri/files/fail2.json
diff --git a/test/integration/roles/test_uri/files/fail20.json b/test/integration/targets/uri/files/fail20.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail20.json
rename to test/integration/targets/uri/files/fail20.json
diff --git a/test/integration/roles/test_uri/files/fail21.json b/test/integration/targets/uri/files/fail21.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail21.json
rename to test/integration/targets/uri/files/fail21.json
diff --git a/test/integration/roles/test_uri/files/fail22.json b/test/integration/targets/uri/files/fail22.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail22.json
rename to test/integration/targets/uri/files/fail22.json
diff --git a/test/integration/roles/test_uri/files/fail23.json b/test/integration/targets/uri/files/fail23.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail23.json
rename to test/integration/targets/uri/files/fail23.json
diff --git a/test/integration/roles/test_uri/files/fail24.json b/test/integration/targets/uri/files/fail24.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail24.json
rename to test/integration/targets/uri/files/fail24.json
diff --git a/test/integration/roles/test_uri/files/fail25.json b/test/integration/targets/uri/files/fail25.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail25.json
rename to test/integration/targets/uri/files/fail25.json
diff --git a/test/integration/roles/test_uri/files/fail26.json b/test/integration/targets/uri/files/fail26.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail26.json
rename to test/integration/targets/uri/files/fail26.json
diff --git a/test/integration/roles/test_uri/files/fail27.json b/test/integration/targets/uri/files/fail27.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail27.json
rename to test/integration/targets/uri/files/fail27.json
diff --git a/test/integration/roles/test_uri/files/fail28.json b/test/integration/targets/uri/files/fail28.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail28.json
rename to test/integration/targets/uri/files/fail28.json
diff --git a/test/integration/roles/test_uri/files/fail29.json b/test/integration/targets/uri/files/fail29.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail29.json
rename to test/integration/targets/uri/files/fail29.json
diff --git a/test/integration/roles/test_uri/files/fail3.json b/test/integration/targets/uri/files/fail3.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail3.json
rename to test/integration/targets/uri/files/fail3.json
diff --git a/test/integration/roles/test_uri/files/fail30.json b/test/integration/targets/uri/files/fail30.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail30.json
rename to test/integration/targets/uri/files/fail30.json
diff --git a/test/integration/roles/test_uri/files/fail4.json b/test/integration/targets/uri/files/fail4.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail4.json
rename to test/integration/targets/uri/files/fail4.json
diff --git a/test/integration/roles/test_uri/files/fail5.json b/test/integration/targets/uri/files/fail5.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail5.json
rename to test/integration/targets/uri/files/fail5.json
diff --git a/test/integration/roles/test_uri/files/fail6.json b/test/integration/targets/uri/files/fail6.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail6.json
rename to test/integration/targets/uri/files/fail6.json
diff --git a/test/integration/roles/test_uri/files/fail7.json b/test/integration/targets/uri/files/fail7.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail7.json
rename to test/integration/targets/uri/files/fail7.json
diff --git a/test/integration/roles/test_uri/files/fail8.json b/test/integration/targets/uri/files/fail8.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail8.json
rename to test/integration/targets/uri/files/fail8.json
diff --git a/test/integration/roles/test_uri/files/fail9.json b/test/integration/targets/uri/files/fail9.json
similarity index 100%
rename from test/integration/roles/test_uri/files/fail9.json
rename to test/integration/targets/uri/files/fail9.json
diff --git a/test/integration/roles/test_uri/files/pass0.json b/test/integration/targets/uri/files/pass0.json
similarity index 100%
rename from test/integration/roles/test_uri/files/pass0.json
rename to test/integration/targets/uri/files/pass0.json
diff --git a/test/integration/roles/test_uri/files/pass1.json b/test/integration/targets/uri/files/pass1.json
similarity index 100%
rename from test/integration/roles/test_uri/files/pass1.json
rename to test/integration/targets/uri/files/pass1.json
diff --git a/test/integration/roles/test_uri/files/pass2.json b/test/integration/targets/uri/files/pass2.json
similarity index 100%
rename from test/integration/roles/test_uri/files/pass2.json
rename to test/integration/targets/uri/files/pass2.json
diff --git a/test/integration/roles/test_uri/files/pass3.json b/test/integration/targets/uri/files/pass3.json
similarity index 100%
rename from test/integration/roles/test_uri/files/pass3.json
rename to test/integration/targets/uri/files/pass3.json
diff --git a/test/integration/roles/test_uri/files/pass4.json b/test/integration/targets/uri/files/pass4.json
similarity index 100%
rename from test/integration/roles/test_uri/files/pass4.json
rename to test/integration/targets/uri/files/pass4.json
diff --git a/test/integration/roles/test_uri/files/testserver.py b/test/integration/targets/uri/files/testserver.py
similarity index 100%
rename from test/integration/roles/test_uri/files/testserver.py
rename to test/integration/targets/uri/files/testserver.py
diff --git a/test/integration/roles/test_uri/meta/main.yml b/test/integration/targets/uri/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_uri/meta/main.yml
rename to test/integration/targets/uri/meta/main.yml
diff --git a/test/integration/roles/test_uri/tasks/main.yml b/test/integration/targets/uri/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_uri/tasks/main.yml
rename to test/integration/targets/uri/tasks/main.yml
diff --git a/test/integration/roles/test_uri/vars/main.yml b/test/integration/targets/uri/vars/main.yml
similarity index 100%
rename from test/integration/roles/test_uri/vars/main.yml
rename to test/integration/targets/uri/vars/main.yml
diff --git a/test/integration/roles/test_yum/meta/main.yml b/test/integration/targets/yum/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_yum/meta/main.yml
rename to test/integration/targets/yum/meta/main.yml
diff --git a/test/integration/roles/test_yum/tasks/main.yml b/test/integration/targets/yum/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_yum/tasks/main.yml
rename to test/integration/targets/yum/tasks/main.yml
diff --git a/test/integration/roles/test_yum/tasks/yum.yml b/test/integration/targets/yum/tasks/yum.yml
similarity index 100%
rename from test/integration/roles/test_yum/tasks/yum.yml
rename to test/integration/targets/yum/tasks/yum.yml
diff --git a/test/integration/roles/test_zypper/files/empty.spec b/test/integration/targets/zypper/files/empty.spec
similarity index 100%
rename from test/integration/roles/test_zypper/files/empty.spec
rename to test/integration/targets/zypper/files/empty.spec
diff --git a/test/integration/roles/test_zypper/meta/main.yml b/test/integration/targets/zypper/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_zypper/meta/main.yml
rename to test/integration/targets/zypper/meta/main.yml
diff --git a/test/integration/roles/test_zypper/tasks/main.yml b/test/integration/targets/zypper/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_zypper/tasks/main.yml
rename to test/integration/targets/zypper/tasks/main.yml
diff --git a/test/integration/roles/test_zypper/tasks/zypper.yml b/test/integration/targets/zypper/tasks/zypper.yml
similarity index 100%
rename from test/integration/roles/test_zypper/tasks/zypper.yml
rename to test/integration/targets/zypper/tasks/zypper.yml
diff --git a/test/integration/roles/test_zypper_repository/meta/main.yml b/test/integration/targets/zypper_repository/meta/main.yml
similarity index 100%
rename from test/integration/roles/test_zypper_repository/meta/main.yml
rename to test/integration/targets/zypper_repository/meta/main.yml
diff --git a/test/integration/roles/test_zypper_repository/tasks/main.yml b/test/integration/targets/zypper_repository/tasks/main.yml
similarity index 100%
rename from test/integration/roles/test_zypper_repository/tasks/main.yml
rename to test/integration/targets/zypper_repository/tasks/main.yml
diff --git a/test/integration/roles/test_zypper_repository/tasks/zypper_repository.yml b/test/integration/targets/zypper_repository/tasks/zypper_repository.yml
similarity index 100%
rename from test/integration/roles/test_zypper_repository/tasks/zypper_repository.yml
rename to test/integration/targets/zypper_repository/tasks/zypper_repository.yml