From e4cb989d11a174030ae3f2313650dd91c9fbb9d0 Mon Sep 17 00:00:00 2001
From: Teoman ONAY <tonay@ibm.com>
Date: Mon, 4 Dec 2023 15:40:51 +0100
Subject: [PATCH] ansible: bump version to 2.12 to 2.15

- Ansible 2.9 is not supported since May 2022
- requirements versions filter removed to use latest versions

Signed-off-by: Teoman ONAY <tonay@ibm.com>
---
 requirements.txt             | 10 +++++-----
 tests/functional/conftest.py |  2 +-
 tests/functional/pytest.ini  |  3 +++
 tests/requirements.txt       | 10 +++++-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 41bb242..3f873d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-testinfra>=3,<4
-pytest-xdist==1.28.0
-pytest>=4.6,<5.0
-ansible>=2.9,<2.10,!=2.9.10
-Jinja2>=2.10
+pytest-testinfra
+pytest-xdist
+pytest
+ansible>4,<9
+Jinja2
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
index 0bd13b4..a53aa61 100644
--- a/tests/functional/conftest.py
+++ b/tests/functional/conftest.py
@@ -4,7 +4,7 @@
 def node(host, request):
     ansible_vars = host.ansible.get_variables()
 
-    if request.node.get_closest_marker("no_client") and ansible_vars['group_names'] == ['clients']:
+    if request.node.get_closest_marker("no_client") and 'clients' in ansible_vars['group_names']:
         pytest.skip("Not a valid test for client nodes")
 
     if request.node.get_closest_marker("client") and 'clients' not in ansible_vars['group_names']:
diff --git a/tests/functional/pytest.ini b/tests/functional/pytest.ini
index 73b7c9a..ce242a9 100644
--- a/tests/functional/pytest.ini
+++ b/tests/functional/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
 markers =
   admin: for admin nodes
+  no_client: for non client nodes
+  client: for client nodes
+  osd: for osd nodes
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 41bb242..3f873d8 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,5 +1,5 @@
-testinfra>=3,<4
-pytest-xdist==1.28.0
-pytest>=4.6,<5.0
-ansible>=2.9,<2.10,!=2.9.10
-Jinja2>=2.10
+pytest-testinfra
+pytest-xdist
+pytest
+ansible>4,<9
+Jinja2