From 0892d48ebc94210d3e0526aa425f7fe7a64d1d2f Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Mon, 5 Aug 2019 15:01:58 -0400 Subject: [PATCH] Do not install requests[security] for MongoDB tests (#60083) Cleanup packages installed via pip for MongoDB tests ci_complete --- test/integration/targets/mongodb_replicaset/aliases | 1 - test/integration/targets/mongodb_shard/aliases | 1 - test/integration/targets/setup_mongodb/defaults/main.yml | 1 - test/integration/targets/setup_mongodb/handlers/main.yml | 5 +++++ test/integration/targets/setup_mongodb/tasks/main.yml | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/integration/targets/mongodb_replicaset/aliases b/test/integration/targets/mongodb_replicaset/aliases index e7ce95b73a0..e9fc78ee6de 100644 --- a/test/integration/targets/mongodb_replicaset/aliases +++ b/test/integration/targets/mongodb_replicaset/aliases @@ -4,4 +4,3 @@ skip/osx skip/freebsd skip/rhel needs/root -disabled diff --git a/test/integration/targets/mongodb_shard/aliases b/test/integration/targets/mongodb_shard/aliases index e7ce95b73a0..e9fc78ee6de 100644 --- a/test/integration/targets/mongodb_shard/aliases +++ b/test/integration/targets/mongodb_shard/aliases @@ -4,4 +4,3 @@ skip/osx skip/freebsd skip/rhel needs/root -disabled diff --git a/test/integration/targets/setup_mongodb/defaults/main.yml b/test/integration/targets/setup_mongodb/defaults/main.yml index ee3e822f413..55acd964e88 100644 --- a/test/integration/targets/setup_mongodb/defaults/main.yml +++ b/test/integration/targets/setup_mongodb/defaults/main.yml @@ -46,5 +46,4 @@ redhat_packages_py3: pip_packages: - psutil - - requests[security] - pymongo diff --git a/test/integration/targets/setup_mongodb/handlers/main.yml b/test/integration/targets/setup_mongodb/handlers/main.yml index af1b8f4baa8..1b73525e9c9 100644 --- a/test/integration/targets/setup_mongodb/handlers/main.yml +++ b/test/integration/targets/setup_mongodb/handlers/main.yml @@ -17,3 +17,8 @@ yum: name: "{{ redhat_packages_py36 }}" state: absent + +- name: remove mongodb pip packages + pip: + name: "{{ pip_packages }}" + state: absent diff --git a/test/integration/targets/setup_mongodb/tasks/main.yml b/test/integration/targets/setup_mongodb/tasks/main.yml index 4477762f721..4b3817bebdf 100644 --- a/test/integration/targets/setup_mongodb/tasks/main.yml +++ b/test/integration/targets/setup_mongodb/tasks/main.yml @@ -184,3 +184,4 @@ pip: name: "{{ pip_packages }}" state: present + notify: remove mongodb pip packages