From 7779137b71ca730fad18acdeba91e3c74011f075 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Fri, 21 Aug 2020 04:53:24 -0500 Subject: [PATCH] [stable-2.9] disable mongodb_* tests, fix setup_mongodb (#71388) * Disable mongodb_replicaset tests for now Change: - 4.0.20 breaks tests, disable for now Test Plan: - CI Tickets: - https://github.com/ansible-collections/community.mongodb/issues/136 Signed-off-by: Rick Elrod * setup_mongodb: Nix RH package installation/removal Change: - Our RHEL and CentOS images make these unnecessary and they were broken. Test Plan: - CI Signed-off-by: Rick Elrod * Disable mongodb_shard tests for now Change: - 4.0.20 breaks tests, disable for now Test Plan: - CI Tickets: - https://github.com/ansible-collections/community.mongodb/issues/136 Signed-off-by: Rick Elrod --- .../targets/mongodb_replicaset/aliases | 1 + test/integration/targets/mongodb_shard/aliases | 1 + .../targets/setup_mongodb/defaults/main.yml | 10 ---------- .../targets/setup_mongodb/handlers/main.yml | 10 ---------- .../targets/setup_mongodb/tasks/main.yml | 17 ----------------- 5 files changed, 2 insertions(+), 37 deletions(-) diff --git a/test/integration/targets/mongodb_replicaset/aliases b/test/integration/targets/mongodb_replicaset/aliases index e9fc78ee6de..aa93cb304d3 100644 --- a/test/integration/targets/mongodb_replicaset/aliases +++ b/test/integration/targets/mongodb_replicaset/aliases @@ -4,3 +4,4 @@ skip/osx skip/freebsd skip/rhel needs/root +disabled # broken with newer mongodb (4.0.20) diff --git a/test/integration/targets/mongodb_shard/aliases b/test/integration/targets/mongodb_shard/aliases index e9fc78ee6de..aa93cb304d3 100644 --- a/test/integration/targets/mongodb_shard/aliases +++ b/test/integration/targets/mongodb_shard/aliases @@ -4,3 +4,4 @@ skip/osx skip/freebsd skip/rhel needs/root +disabled # broken with newer mongodb (4.0.20) diff --git a/test/integration/targets/setup_mongodb/defaults/main.yml b/test/integration/targets/setup_mongodb/defaults/main.yml index 957230bac47..b6d8dd6d421 100644 --- a/test/integration/targets/setup_mongodb/defaults/main.yml +++ b/test/integration/targets/setup_mongodb/defaults/main.yml @@ -34,16 +34,6 @@ debian_packages_py36: - python3-setuptools - python3-pip -redhat_packages_py2: - - python-devel - - python-setuptools - - python-pip - -redhat_packages_py3: - - python3-devel - - python3-setuptools - - python3-pip - pip_packages: - psutil==5.6.7 - pymongo==3.10.1 diff --git a/test/integration/targets/setup_mongodb/handlers/main.yml b/test/integration/targets/setup_mongodb/handlers/main.yml index 1b73525e9c9..4ec9608fdb1 100644 --- a/test/integration/targets/setup_mongodb/handlers/main.yml +++ b/test/integration/targets/setup_mongodb/handlers/main.yml @@ -8,16 +8,6 @@ name: "{{ debian_packages_py36 }}" state: absent -- name: Remove redhat_packages_py2 - yum: - name: "{{ redhat_packages_py36 }}" - state: absent - -- name: Remove redhat_packages_py36 - yum: - name: "{{ redhat_packages_py36 }}" - state: absent - - name: remove mongodb pip packages pip: name: "{{ pip_packages }}" diff --git a/test/integration/targets/setup_mongodb/tasks/main.yml b/test/integration/targets/setup_mongodb/tasks/main.yml index 4b3817bebdf..08f1c589c12 100644 --- a/test/integration/targets/setup_mongodb/tasks/main.yml +++ b/test/integration/targets/setup_mongodb/tasks/main.yml @@ -163,23 +163,6 @@ - ansible_distribution_version == "18.04" notify: Remove debian_packages_py36 -- name: Install redhat_packages_py2 - yum: - name: "{{ redhat_packages_py2 }}" - when: - - ansible_os_family == "RedHat" - - ansible_distribution_version|float < 8 - - not (ansible_os_family == "RedHat" and ansible_distribution_version|float < 8) - notify: Remove redhat_packages_py2 - -- name: Install redhat_packages_py3 - yum: - name: "{{ redhat_packages_py3 }}" - when: - - ansible_os_family == "RedHat" - - ansible_distribution_version|float >= 8 - notify: Remove redhat_packages_py3 - - name: Install pip packages pip: name: "{{ pip_packages }}"