Migrate Linux CI roles to test targets. (#17997)

8 years ago · 75e4645ee7
parent 374e4348e4
commit 75e4645ee7
263 changed files with 53 additions and 53 deletions
--- 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))
--- 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 }
--- 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 }
--- a/test/integration/roles/test_add_host/tasks/main.yml
+++ b/test/integration/roles/test_add_host/tasks/main.yml
--- a/test/integration/roles/test_apache2_module/meta/main.yml
+++ b/test/integration/roles/test_apache2_module/meta/main.yml
--- a/test/integration/roles/test_apache2_module/tasks/actualtest.yml
+++ b/test/integration/roles/test_apache2_module/tasks/actualtest.yml
--- a/test/integration/roles/test_apache2_module/tasks/main.yml
+++ b/test/integration/roles/test_apache2_module/tasks/main.yml
--- a/test/integration/roles/test_apt/meta/main.yml
+++ b/test/integration/roles/test_apt/meta/main.yml
--- a/test/integration/roles/test_apt/tasks/apt-builddep.yml
+++ b/test/integration/roles/test_apt/tasks/apt-builddep.yml
--- a/test/integration/roles/test_apt/tasks/apt.yml
+++ b/test/integration/roles/test_apt/tasks/apt.yml
--- a/test/integration/roles/test_apt/tasks/main.yml
+++ b/test/integration/roles/test_apt/tasks/main.yml
--- a/test/integration/roles/test_apt_repository/meta/main.yml
+++ b/test/integration/roles/test_apt_repository/meta/main.yml
--- a/test/integration/roles/test_apt_repository/tasks/apt.yml
+++ b/test/integration/roles/test_apt_repository/tasks/apt.yml
--- a/test/integration/roles/test_apt_repository/tasks/cleanup.yml
+++ b/test/integration/roles/test_apt_repository/tasks/cleanup.yml
--- a/test/integration/roles/test_apt_repository/tasks/main.yml
+++ b/test/integration/roles/test_apt_repository/tasks/main.yml
--- a/test/integration/roles/test_assemble/files/fragment1
+++ b/test/integration/roles/test_assemble/files/fragment1
--- a/test/integration/roles/test_assemble/files/fragment2
+++ b/test/integration/roles/test_assemble/files/fragment2
--- a/test/integration/roles/test_assemble/files/fragment3
+++ b/test/integration/roles/test_assemble/files/fragment3
--- a/test/integration/roles/test_assemble/files/fragment4
+++ b/test/integration/roles/test_assemble/files/fragment4
--- a/test/integration/roles/test_assemble/files/fragment5
+++ b/test/integration/roles/test_assemble/files/fragment5
--- a/test/integration/roles/test_assemble/meta/main.yml
+++ b/test/integration/roles/test_assemble/meta/main.yml
--- a/test/integration/roles/test_assemble/tasks/main.yml
+++ b/test/integration/roles/test_assemble/tasks/main.yml
--- a/test/integration/roles/test_async/library/async_test.py
+++ b/test/integration/roles/test_async/library/async_test.py
--- a/test/integration/roles/test_async/meta/main.yml
+++ b/test/integration/roles/test_async/meta/main.yml
--- a/test/integration/roles/test_async/tasks/main.yml
+++ b/test/integration/roles/test_async/tasks/main.yml
--- a/test/integration/roles/test_authorized_key/defaults/main.yml
+++ b/test/integration/roles/test_authorized_key/defaults/main.yml
--- a/test/integration/roles/test_authorized_key/meta/main.yml
+++ b/test/integration/roles/test_authorized_key/meta/main.yml
--- a/test/integration/roles/test_authorized_key/tasks/main.yml
+++ b/test/integration/roles/test_authorized_key/tasks/main.yml
--- a/test/integration/roles/test_become/files/baz.txt
+++ b/test/integration/roles/test_become/files/baz.txt
--- a/test/integration/roles/test_become/tasks/main.yml
+++ b/test/integration/roles/test_become/tasks/main.yml
--- a/test/integration/roles/test_become/templates/bar.j2
+++ b/test/integration/roles/test_become/templates/bar.j2
--- a/test/integration/roles/test_become/vars/default.yml
+++ b/test/integration/roles/test_become/vars/default.yml
--- a/test/integration/roles/test_binary/files/b64_latin1
+++ b/test/integration/roles/test_binary/files/b64_latin1
--- a/test/integration/roles/test_binary/files/b64_utf8
+++ b/test/integration/roles/test_binary/files/b64_utf8
--- a/test/integration/roles/test_binary/files/from_playbook
+++ b/test/integration/roles/test_binary/files/from_playbook
--- a/test/integration/roles/test_binary/meta/main.yml
+++ b/test/integration/roles/test_binary/meta/main.yml
--- a/test/integration/roles/test_binary/tasks/main.yml
+++ b/test/integration/roles/test_binary/tasks/main.yml
--- a/test/integration/roles/test_binary/templates/b64_latin1_template.j2
+++ b/test/integration/roles/test_binary/templates/b64_latin1_template.j2
--- a/test/integration/roles/test_binary/templates/b64_utf8_template.j2
+++ b/test/integration/roles/test_binary/templates/b64_utf8_template.j2
--- a/test/integration/roles/test_binary/templates/from_playbook_template.j2
+++ b/test/integration/roles/test_binary/templates/from_playbook_template.j2
--- a/test/integration/roles/test_binary/vars/main.yml
+++ b/test/integration/roles/test_binary/vars/main.yml
--- a/test/integration/roles/test_changed_when/meta/main.yml
+++ b/test/integration/roles/test_changed_when/meta/main.yml
--- a/test/integration/roles/test_changed_when/tasks/main.yml
+++ b/test/integration/roles/test_changed_when/tasks/main.yml
--- a/test/integration/roles/test_command_shell/files/create_afile.sh
+++ b/test/integration/roles/test_command_shell/files/create_afile.sh
--- a/test/integration/roles/test_command_shell/files/remove_afile.sh
+++ b/test/integration/roles/test_command_shell/files/remove_afile.sh
--- a/test/integration/roles/test_command_shell/files/test.sh
+++ b/test/integration/roles/test_command_shell/files/test.sh
--- a/test/integration/roles/test_command_shell/meta/main.yml
+++ b/test/integration/roles/test_command_shell/meta/main.yml
--- a/test/integration/roles/test_command_shell/tasks/main.yml
+++ b/test/integration/roles/test_command_shell/tasks/main.yml
--- a/test/integration/roles/test_conditionals/tasks/main.yml
+++ b/test/integration/roles/test_conditionals/tasks/main.yml
--- a/test/integration/roles/test_conditionals/vars/main.yml
+++ b/test/integration/roles/test_conditionals/vars/main.yml
--- a/test/integration/roles/test_copy/files/foo.txt
+++ b/test/integration/roles/test_copy/files/foo.txt
--- a/test/integration/roles/test_copy/files/subdir/bar.txt
+++ b/test/integration/roles/test_copy/files/subdir/bar.txt
--- a/test/integration/roles/test_copy/files/subdir/subdir2/baz.txt
+++ b/test/integration/roles/test_copy/files/subdir/subdir2/baz.txt
--- a/test/integration/roles/test_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
+++ b/test/integration/roles/test_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
--- a/test/integration/roles/test_copy/meta/main.yml
+++ b/test/integration/roles/test_copy/meta/main.yml
--- a/test/integration/roles/test_copy/tasks/main.yml
+++ b/test/integration/roles/test_copy/tasks/main.yml
--- a/test/integration/roles/test_docker/files/devdockerCA.crt
+++ b/test/integration/roles/test_docker/files/devdockerCA.crt
--- a/test/integration/roles/test_docker/files/devdockerCA.key
+++ b/test/integration/roles/test_docker/files/devdockerCA.key
--- a/test/integration/roles/test_docker/files/devdockerCA.srl
+++ b/test/integration/roles/test_docker/files/devdockerCA.srl
--- a/test/integration/roles/test_docker/files/docker-registry.htpasswd
+++ b/test/integration/roles/test_docker/files/docker-registry.htpasswd
--- a/test/integration/roles/test_docker/files/dockertest.ansible.com.crt
+++ b/test/integration/roles/test_docker/files/dockertest.ansible.com.crt
--- a/test/integration/roles/test_docker/files/dockertest.ansible.com.csr
+++ b/test/integration/roles/test_docker/files/dockertest.ansible.com.csr
--- a/test/integration/roles/test_docker/files/dockertest.ansible.com.key
+++ b/test/integration/roles/test_docker/files/dockertest.ansible.com.key
--- a/test/integration/roles/test_docker/files/nginx-docker-registry.conf
+++ b/test/integration/roles/test_docker/files/nginx-docker-registry.conf
--- a/test/integration/roles/test_docker/meta/main.yml
+++ b/test/integration/roles/test_docker/meta/main.yml
--- a/test/integration/roles/test_docker/tasks/docker-setup-debian.yml
+++ b/test/integration/roles/test_docker/tasks/docker-setup-debian.yml
--- a/test/integration/roles/test_docker/tasks/docker-setup-rht.yml
+++ b/test/integration/roles/test_docker/tasks/docker-setup-rht.yml
--- a/test/integration/roles/test_docker/tasks/docker-tests.yml
+++ b/test/integration/roles/test_docker/tasks/docker-tests.yml
--- a/test/integration/roles/test_docker/tasks/main.yml
+++ b/test/integration/roles/test_docker/tasks/main.yml
--- a/test/integration/roles/test_docker/tasks/registry-tests.yml
+++ b/test/integration/roles/test_docker/tasks/registry-tests.yml
--- a/test/integration/roles/test_embedded_module/library/test_integration_module
+++ b/test/integration/roles/test_embedded_module/library/test_integration_module
--- a/test/integration/roles/test_embedded_module/tasks/main.yml
+++ b/test/integration/roles/test_embedded_module/tasks/main.yml
--- a/test/integration/roles/test_facts_d/meta/main.yml
+++ b/test/integration/roles/test_facts_d/meta/main.yml
--- a/test/integration/roles/test_facts_d/tasks/main.yml
+++ b/test/integration/roles/test_facts_d/tasks/main.yml
--- a/test/integration/roles/test_failed_when/tasks/main.yml
+++ b/test/integration/roles/test_failed_when/tasks/main.yml
--- a/test/integration/roles/test_fetch/meta/main.yml
+++ b/test/integration/roles/test_fetch/meta/main.yml
--- a/test/integration/roles/test_fetch/tasks/main.yml
+++ b/test/integration/roles/test_fetch/tasks/main.yml
--- a/test/integration/roles/test_file/files/foo.txt
+++ b/test/integration/roles/test_file/files/foo.txt
--- a/test/integration/roles/test_file/files/foobar/directory/fileC
+++ b/test/integration/roles/test_file/files/foobar/directory/fileC
--- a/test/integration/roles/test_file/files/foobar/directory/fileD
+++ b/test/integration/roles/test_file/files/foobar/directory/fileD
--- a/test/integration/roles/test_file/files/foobar/fileA
+++ b/test/integration/roles/test_file/files/foobar/fileA
--- a/test/integration/roles/test_file/files/foobar/fileB
+++ b/test/integration/roles/test_file/files/foobar/fileB
--- a/test/integration/roles/test_file/meta/main.yml
+++ b/test/integration/roles/test_file/meta/main.yml
--- a/test/integration/roles/test_file/tasks/main.yml
+++ b/test/integration/roles/test_file/tasks/main.yml
--- a/test/integration/roles/test_file/tasks/selinux_tests.yml
+++ b/test/integration/roles/test_file/tasks/selinux_tests.yml
--- a/test/integration/roles/test_filters/files/9851.txt
+++ b/test/integration/roles/test_filters/files/9851.txt
--- a/test/integration/roles/test_filters/files/foo.txt
+++ b/test/integration/roles/test_filters/files/foo.txt
--- a/test/integration/roles/test_filters/meta/main.yml
+++ b/test/integration/roles/test_filters/meta/main.yml
--- a/test/integration/roles/test_filters/tasks/main.yml
+++ b/test/integration/roles/test_filters/tasks/main.yml
--- a/test/integration/roles/test_filters/templates/foo.j2
+++ b/test/integration/roles/test_filters/templates/foo.j2
--- a/test/integration/roles/test_filters/templates/py26json.j2
+++ b/test/integration/roles/test_filters/templates/py26json.j2
--- a/test/integration/roles/test_filters/vars/main.yml
+++ b/test/integration/roles/test_filters/vars/main.yml
--- a/test/integration/roles/test_gem/meta/main.yml
+++ b/test/integration/roles/test_gem/meta/main.yml
--- a/test/integration/roles/test_gem/tasks/main.yml
+++ b/test/integration/roles/test_gem/tasks/main.yml
--- a/test/integration/roles/test_get_url/meta/main.yml
+++ b/test/integration/roles/test_get_url/meta/main.yml
--- a/test/integration/roles/test_get_url/tasks/main.yml
+++ b/test/integration/roles/test_get_url/tasks/main.yml
--- a/test/integration/roles/test_git/meta/main.yml
+++ b/test/integration/roles/test_git/meta/main.yml
--- a/test/integration/roles/test_git/tasks/main.yml
+++ b/test/integration/roles/test_git/tasks/main.yml
--- a/test/integration/roles/test_hg/meta/main.yml
+++ b/test/integration/roles/test_hg/meta/main.yml
--- a/test/integration/roles/test_hg/tasks/main.yml
+++ b/test/integration/roles/test_hg/tasks/main.yml
--- a/Show More
+++ b/Show More