diff --git a/test/integration/targets/setup_zabbix/handlers/main.yml b/test/integration/targets/setup_zabbix/handlers/main.yml new file mode 100644 index 00000000000..a39556215a6 --- /dev/null +++ b/test/integration/targets/setup_zabbix/handlers/main.yml @@ -0,0 +1,15 @@ +- name: remove zabbix repository + apt_repository: + repo: "{{ zabbix_apt_repository }}" + filename: zabbix + state: absent + +- name: remove zabbix packages + apt: + name: "{{ zabbix_packages }}" + state: absent + +- name: remove zabbix pip packages + pip: + name: zabbix-api + state: absent diff --git a/test/integration/targets/setup_zabbix/tasks/setup.yml b/test/integration/targets/setup_zabbix/tasks/setup.yml index b3d31e5a46d..2af51f9431b 100644 --- a/test/integration/targets/setup_zabbix/tasks/setup.yml +++ b/test/integration/targets/setup_zabbix/tasks/setup.yml @@ -10,6 +10,7 @@ repo: "{{ zabbix_apt_repository }}" filename: zabbix state: present + notify: remove zabbix repository - name: check if dpkg is set to exclude specific destinations stat: @@ -29,11 +30,13 @@ name: "{{ zabbix_packages }}" state: latest update_cache: yes + notify: remove zabbix packages - name: install zabbix-api python package pip: name: zabbix-api state: latest + notify: remove zabbix pip packages - name: create mysql user {{ db_user }} mysql_user: diff --git a/test/integration/targets/zabbix_host/aliases b/test/integration/targets/zabbix_host/aliases index 6b82262261d..3d0091e7a94 100644 --- a/test/integration/targets/zabbix_host/aliases +++ b/test/integration/targets/zabbix_host/aliases @@ -3,4 +3,3 @@ shippable/posix/group1 skip/osx skip/freebsd skip/rhel -disabled diff --git a/test/integration/targets/zabbix_host/tasks/main.yml b/test/integration/targets/zabbix_host/tasks/main.yml index 51c35a71735..914c1e5fcf2 100644 --- a/test/integration/targets/zabbix_host/tasks/main.yml +++ b/test/integration/targets/zabbix_host/tasks/main.yml @@ -14,4 +14,3 @@ when: - ansible_distribution == 'Ubuntu' - - ansible_distribution_release == 'bionic'