From 17c1bb6f083da5dc4957bb5f3be98b3fff19a9d0 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 29 Jun 2017 12:34:54 -0700 Subject: [PATCH] Remove legacy integration test make targets. (#26255) * Remove legacy integration test make targets. * Remove incorrect role path from cloudscale test. --- test/integration/Makefile | 199 +-------------------------- test/integration/destructive.yml | 25 ---- test/integration/non_destructive.yml | 38 ----- test/integration/test_win_group1.yml | 11 -- test/integration/test_win_group2.yml | 15 -- test/integration/test_win_group3.yml | 12 -- 6 files changed, 6 insertions(+), 294 deletions(-) delete mode 100644 test/integration/destructive.yml delete mode 100644 test/integration/non_destructive.yml delete mode 100644 test/integration/test_win_group1.yml delete mode 100644 test/integration/test_win_group2.yml delete mode 100644 test/integration/test_win_group3.yml diff --git a/test/integration/Makefile b/test/integration/Makefile index aa9d72b516d..adf0b3e9d0c 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -1,3 +1,8 @@ +# This Makefile is for legacy integration tests. +# Most new tests should be implemented using ansible-test. +# Existing tests are slowly being migrated to ansible-test. +# See: http://docs.ansible.com/ansible/dev_guide/testing_integration.html + TEST_DIR ?= ~/ansible_testing INVENTORY ?= inventory VARS_FILE ?= integration_config.yml @@ -25,175 +30,10 @@ EUID := $(shell id -u -r) UNAME := $(shell uname | tr '[:upper:]' '[:lower:]') -all: other non_destructive destructive - -other: ansible test_test_infra parsing test_var_blending test_var_precedence unicode test_templating_settings \ - environment test_as includes blocks pull_run pull_no_127 pull_limit_inventory check_mode test_hash test_handlers \ - test_group_by test_vault test_tags test_lookup_paths no_log test_gathering_facts test_binary_modules_posix \ - test_hosts_field test_lookup_properties args test_jinja2_groupby test_callback_retry_task_name - -ansible: - (cd targets/ansible && ./runme.sh $(TEST_FLAGS)) - -test_test_infra: - (cd targets/test_infra && ./runme.sh $(TEST_FLAGS)) - setup: rm -rf $(TEST_DIR) mkdir -p $(TEST_DIR) -parsing: - (cd targets/parsing && ./runme.sh $(TEST_FLAGS)) - -includes: - (cd targets/includes && ./runme.sh $(TEST_FLAGS)) - -pull_run: - (cd targets/pull_run && ./runme.sh $(TEST_FLAGS)) - -pull_no_127: - (cd targets/pull_no_127 && ./runme.sh $(TEST_FLAGS)) - -pull_limit_inventory: - (cd targets/pull_limit_inventory && ./runme.sh $(TEST_FLAGS)) - -unicode: - (cd targets/unicode && ./runme.sh $(TEST_FLAGS)) - -test_templating_settings: - (cd targets/templating_settings && ./runme.sh $(TEST_FLAGS)) - -test_gathering_facts: - (cd targets/gathering_facts && ./runme.sh $(TEST_FLAGS)) - -environment: - (cd targets/environment && ./runme.sh $(TEST_FLAGS)) - -test_jinja2_groupby: - (cd targets/filters && ./runme.sh $(TEST_FLAGS)) - -non_destructive: setup - ANSIBLE_ROLES_PATH=$(shell pwd)/targets ansible-playbook non_destructive.yml -i $(INVENTORY) -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 - -# For tests running in our Docker containers (identified with "ENV container=docker"). -# These tests are run as root and have access to a local SSH daemon. -test_as_docker: test_root_ssh test_async_extra_data - -# For tests running in our FreeBSD instances on EC2 (identified with "ENV container=freebsd"). -# These tests are run as root and have access to a local SSH daemon. -test_as_freebsd: test_root_ssh - -# For tests running in our OS X instances at MacStadium (identified with "ENV container=osx"). -# These tests are run as root and have access to a local SSH daemon. -test_as_osx: test_root_ssh - -# For tests running as root. -# Login to a local SSH daemon assumed to be unavailable. -test_as_root: test_connection_local test_connection_chroot - -# For tests not running as root. -# Login to a local SSH daemon assumed to be unavailable. -test_as_non_root: test_connection_local - -# Determine which of the above environments we're running in. -ifeq ($(container),docker) -TEST_AS_TARGET := test_as_docker -else ifeq ($(container),freebsd) -TEST_AS_TARGET := test_as_freebsd -else ifeq ($(container),osx) -TEST_AS_TARGET := test_as_osx -else ifeq ($(EUID),0) -TEST_AS_TARGET := test_as_root -else -TEST_AS_TARGET := test_as_non_root -endif - -test_as: $(TEST_AS_TARGET) - -test_connection_local: - (cd targets/connection_local && ./runme.sh $(TEST_FLAGS)) - -test_connection_chroot: - (cd targets/connection_chroot && ./runme.sh $(TEST_FLAGS)) - -test_connection_docker: - (cd targets/connection_docker && ./runme.sh $(TEST_FLAGS)) - -test_connection_libvirt_lxc: - (cd targets/connection_libvirt_lxc && ./runme.sh $(TEST_FLAGS)) - -test_connection_jail: - (cd targets/connection_jail && ./runme.sh $(TEST_FLAGS)) - -test_connection_ssh: - (cd targets/connection_ssh && ./runme.sh $(TEST_FLAGS)) - -test_connection_paramiko_ssh: - (cd targets/connection_paramiko_ssh && ./runme.sh $(TEST_FLAGS)) - -test_connection_lxd: - (cd targets/connection_lxd && ./runme.sh $(TEST_FLAGS)) - -test_connection_lxc: - (cd targets/connection_lxc && ./runme.sh $(TEST_FLAGS)) - -test_connection_winrm: - (cd targets/connection_winrm && ./runme.sh $(TEST_FLAGS)) - -destructive: setup - ANSIBLE_ROLES_PATH=$(shell pwd)/targets ansible-playbook destructive.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) - -check_mode: - (cd targets/check_mode && ./runme.sh $(TEST_FLAGS)) - -test_group_by: - (cd targets/group_by && ./runme.sh $(TEST_FLAGS)) - -test_handlers: - (cd targets/handlers && ./runme.sh $(TEST_FLAGS)) - -test_hash: - (cd targets/hash && ./runme.sh $(TEST_FLAGS)) - -test_var_blending: - (cd targets/var_blending && ./runme.sh $(TEST_FLAGS)) - -test_var_precedence: - (cd targets/var_precedence && ./runme.sh $(TEST_FLAGS)) - -test_vault: - (cd targets/vault && ./runme.sh $(TEST_FLAGS)) - -test_delegate_to: - (cd targets/delegate_to && ./runme.sh $(TEST_FLAGS)) - -# Split Windows CI targets to support parallel execution. -# Targets should be balanced to have similar run times. -ci_win: ci_win1 ci_win2 ci_win3 -ci_win1: test_win_group1 -ci_win2: test_win_group2 test_binary_modules_winrm -ci_win3: test_win_group3 test_connection_winrm - -test_winrm: test_win_group1 test_win_group2 test_win_group3 - -test_win_group1: - ANSIBLE_ROLES_PATH=$(shell pwd)/targets ansible-playbook test_win_group1.yml -i inventory.winrm -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) - -test_win_group2: - ANSIBLE_ROLES_PATH=$(shell pwd)/targets ansible-playbook test_win_group2.yml -i inventory.winrm -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) - -test_win_group3: - ANSIBLE_ROLES_PATH=$(shell pwd)/targets ansible-playbook test_win_group3.yml -i inventory.winrm -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) - -test_tags: - (cd targets/tags && ./runme.sh $(TEST_FLAGS)) - -blocks: - (cd targets/blocks && ./runme.sh $(TEST_FLAGS)) - cloud: amazon rackspace azure cloud_cleanup: amazon_cleanup rackspace_cleanup @@ -258,7 +98,7 @@ cloudflare: $(CREDENTIALS_FILE) exit $$RC; cloudscale: - ANSIBLE_ROLES_PATH=$(shell pwd)/targets ansible-playbook cloudscale.yml -i $(INVENTORY) -e @$(VARS_FILE) -e "resource_prefix=$(CLOUD_RESOURCE_PREFIX)" -v $(TEST_FLAGS) ; \ + ansible-playbook cloudscale.yml -i $(INVENTORY) -e @$(VARS_FILE) -e "resource_prefix=$(CLOUD_RESOURCE_PREFIX)" -v $(TEST_FLAGS) ; \ RC=$$? ; \ exit $$RC; @@ -300,30 +140,3 @@ test_galaxy_git: setup RC=$$? ; \ rm -rf $$mytmpdir ; \ exit $$RC - -test_lookup_paths: - (cd targets/lookup_paths && ./runme.sh $(TEST_FLAGS)) - -no_log: - (cd targets/no_log && ./runme.sh $(TEST_FLAGS)) - -test_binary_modules_winrm: - (cd targets/binary_modules_winrm && ./runme.sh $(TEST_FLAGS)) - -test_binary_modules_posix: - (cd targets/binary_modules_posix && ./runme.sh $(TEST_FLAGS)) - -test_async_extra_data: - (cd targets/async_extra_data && ./runme.sh $(TEST_FLAGS)) - -test_hosts_field: - (cd targets/hosts_field && ./runme.sh $(TEST_FLAGS)) - -test_lookup_properties: - (cd targets/lookup_properties && ./runme.sh $(TEST_FLAGS)) - -args: - (cd targets/args && ./runme.sh $(TEST_FLAGS)) - -test_callback_retry_task_name: - (cd targets/callback_retry_task_name && ./runme.sh $(TEST_FLAGS)) diff --git a/test/integration/destructive.yml b/test/integration/destructive.yml deleted file mode 100644 index 7832a08c2f2..00000000000 --- a/test/integration/destructive.yml +++ /dev/null @@ -1,25 +0,0 @@ -- hosts: testhost - gather_facts: True - roles: - # In destructive because it creates and removes a user - - { 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: dnf, tags: test_dnf } - - { 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: git, tags: test_git } - - { role: locale_gen, tags: test_locale_gen } diff --git a/test/integration/non_destructive.yml b/test/integration/non_destructive.yml deleted file mode 100644 index f33e17549cc..00000000000 --- a/test/integration/non_destructive.yml +++ /dev/null @@ -1,38 +0,0 @@ -- hosts: testhost - gather_facts: yes - roles: - - { 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 } - - { role: sefcontext, tags: [test_sefcontext, needs_root]} - - { role: known_hosts, tags: test_known_hosts } diff --git a/test/integration/test_win_group1.yml b/test/integration/test_win_group1.yml deleted file mode 100644 index 0aeaddb814e..00000000000 --- a/test/integration/test_win_group1.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: windows - gather_facts: false - roles: - - { role: win_raw, tags: test_win_raw } - - { role: win_script, tags: test_win_script } - - { role: win_ping, tags: test_win_ping } - - { role: win_setup, tags: test_win_setup } - - { role: win_slurp, tags: test_win_slurp } - - { role: win_fetch, tags: test_win_fetch } - - { role: win_regmerge, tags: test_win_regmerge } - - { role: win_regedit, tags: test_win_regedit } diff --git a/test/integration/test_win_group2.yml b/test/integration/test_win_group2.yml deleted file mode 100644 index 5eae464ec35..00000000000 --- a/test/integration/test_win_group2.yml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: windows - gather_facts: false - roles: - - { role: win_group, tags: test_win_group } - - { role: win_file, tags: test_win_file } - - { role: win_copy, tags: test_win_copy } - - { role: win_template, tags: test_win_template } - - { role: win_lineinfile, tags: test_win_lineinfile } - - { role: win_stat, tags: test_win_stat } - - { role: win_find, tags: test_win_find } - - { role: win_get_url, tags: test_win_get_url } - - { role: win_msi, tags: test_win_msi } - - { role: win_package, tags: test_win_package } - - { role: win_path, tags: test_win_path } - - { role: win_shortcut, tags: test_win_shortcut } diff --git a/test/integration/test_win_group3.yml b/test/integration/test_win_group3.yml deleted file mode 100644 index 347d328f1d8..00000000000 --- a/test/integration/test_win_group3.yml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: windows - gather_facts: false - roles: - - { role: win_service, tags: test_win_service } - - { role: win_feature, tags: test_win_feature } - - { role: win_user, tags: test_win_user } - - { role: win_async_wrapper, tags: ["test_win_async_wrapper", "test_async_wrapper", "test_win_async_status", "test_async_status"] } - - { role: win_shell, tags: test_win_shell } - - { role: win_command, tags: test_win_command } - - { role: win_reg_stat, tags: test_win_reg_stat } - - { role: win_region, tags: test_win-region } - - { role: win_environment, tags: test_win-environment }